@lightningjs/renderer 0.3.5 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/README.md +6 -1
  2. package/dist/exports/core-api.d.ts +1 -0
  3. package/dist/exports/core-api.js +1 -0
  4. package/dist/exports/core-api.js.map +1 -1
  5. package/dist/exports/main-api.d.ts +1 -0
  6. package/dist/src/core/CoreShaderManager.d.ts +28 -1
  7. package/dist/src/core/CoreShaderManager.js +51 -1
  8. package/dist/src/core/CoreShaderManager.js.map +1 -1
  9. package/dist/src/core/animations/CoreAnimation.d.ts +3 -3
  10. package/dist/src/core/animations/CoreAnimation.js +5 -4
  11. package/dist/src/core/animations/CoreAnimation.js.map +1 -1
  12. package/dist/src/core/renderers/webgl/WebGlCoreCtxSubTexture.js +2 -2
  13. package/dist/src/core/renderers/webgl/WebGlCoreCtxSubTexture.js.map +1 -1
  14. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +8 -5
  15. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
  16. package/dist/src/core/renderers/webgl/WebGlCoreShader.js +2 -2
  17. package/dist/src/core/renderers/webgl/WebGlCoreShader.js.map +1 -1
  18. package/dist/src/core/renderers/webgl/shaders/DynamicShader.d.ts +5 -28
  19. package/dist/src/core/renderers/webgl/shaders/DynamicShader.js +9 -9
  20. package/dist/src/core/renderers/webgl/shaders/DynamicShader.js.map +1 -1
  21. package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js +1 -8
  22. package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js.map +1 -1
  23. package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.d.ts +24 -0
  24. package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.js.map +1 -1
  25. package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.d.ts +1 -1
  26. package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js +2 -9
  27. package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js.map +1 -1
  28. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.d.ts +15 -0
  29. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js.map +1 -1
  30. package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js +3 -2
  31. package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js.map +1 -1
  32. package/dist/src/core/textures/ColorTexture.d.ts +2 -2
  33. package/dist/src/core/textures/ColorTexture.js +4 -3
  34. package/dist/src/core/textures/ColorTexture.js.map +1 -1
  35. package/dist/src/core/textures/ImageTexture.js +14 -11
  36. package/dist/src/core/textures/ImageTexture.js.map +1 -1
  37. package/dist/src/core/textures/NoiseTexture.js +3 -3
  38. package/dist/src/core/textures/NoiseTexture.js.map +1 -1
  39. package/dist/src/core/textures/SubTexture.d.ts +2 -2
  40. package/dist/src/core/textures/SubTexture.js +3 -1
  41. package/dist/src/core/textures/SubTexture.js.map +1 -1
  42. package/dist/src/core/textures/Texture.d.ts +13 -2
  43. package/dist/src/core/textures/Texture.js.map +1 -1
  44. package/dist/src/core/textures/utils.d.ts +11 -0
  45. package/dist/src/core/textures/utils.js +32 -0
  46. package/dist/src/core/textures/utils.js.map +1 -0
  47. package/dist/src/main-api/INode.d.ts +2 -2
  48. package/dist/src/main-api/RendererMain.d.ts +1 -1
  49. package/dist/src/main-api/RendererMain.js.map +1 -1
  50. package/dist/src/render-drivers/main/MainOnlyNode.d.ts +2 -2
  51. package/dist/src/render-drivers/main/MainOnlyNode.js.map +1 -1
  52. package/dist/src/render-drivers/threadx/ThreadXMainNode.d.ts +2 -2
  53. package/dist/src/render-drivers/threadx/ThreadXMainNode.js.map +1 -1
  54. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js.map +1 -1
  55. package/dist/tsconfig.dist.tsbuildinfo +1 -1
  56. package/exports/core-api.ts +1 -0
  57. package/exports/main-api.ts +1 -0
  58. package/package.json +2 -1
  59. package/src/core/CoreShaderManager.ts +90 -2
  60. package/src/core/animations/CoreAnimation.ts +7 -6
  61. package/src/core/renderers/webgl/WebGlCoreCtxSubTexture.ts +2 -2
  62. package/src/core/renderers/webgl/WebGlCoreCtxTexture.ts +13 -11
  63. package/src/core/renderers/webgl/WebGlCoreShader.ts +2 -2
  64. package/src/core/renderers/webgl/shaders/DynamicShader.ts +22 -22
  65. package/src/core/renderers/webgl/shaders/RoundedRectangle.ts +1 -8
  66. package/src/core/renderers/webgl/shaders/effects/FadeOutEffect.ts +24 -0
  67. package/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts +3 -10
  68. package/src/core/renderers/webgl/shaders/effects/RadiusEffect.ts +15 -0
  69. package/src/core/text-rendering/renderers/CanvasTextRenderer.ts +4 -2
  70. package/src/core/textures/ColorTexture.ts +6 -5
  71. package/src/core/textures/ImageTexture.ts +14 -11
  72. package/src/core/textures/NoiseTexture.ts +3 -3
  73. package/src/core/textures/SubTexture.ts +5 -3
  74. package/src/core/textures/Texture.ts +13 -2
  75. package/src/main-api/INode.ts +2 -2
  76. package/src/main-api/RendererMain.ts +1 -1
  77. package/src/render-drivers/main/MainOnlyNode.ts +2 -2
  78. package/src/render-drivers/threadx/ThreadXMainNode.ts +2 -2
  79. package/src/render-drivers/threadx/worker/ThreadXRendererNode.ts +2 -2
package/README.md CHANGED
@@ -32,8 +32,13 @@ npm test
32
32
  # Build API Documentation (builds into ./docs folder)
33
33
  npm run typedoc
34
34
 
35
- # Launch test examples (includes Build Renderer (watch mode))
35
+ # Launch test examples in dev mode (includes Build Renderer (watch mode))
36
36
  npm start
37
+
38
+ # Launch test examples in production mode
39
+ # IMPORTANT: To run test examples on embedded devices that use older browser versions
40
+ # you MUST run the examples in this mode.
41
+ npm run prod
37
42
  ```
38
43
 
39
44
  ## Test Examples
@@ -62,6 +62,7 @@
62
62
  * @module
63
63
  */
64
64
  export * from '../src/core/renderers/webgl/WebGlCoreShader.js';
65
+ export * from '../src/core/renderers/webgl/shaders/effects/ShaderEffect.js';
65
66
  export * from '../src/core/textures/Texture.js';
66
67
  export * from '../src/core/text-rendering/renderers/TextRenderer.js';
67
68
  export * from '../src/core/text-rendering/renderers/CanvasTextRenderer.js';
@@ -81,6 +81,7 @@
81
81
  */
82
82
  // Shaders
83
83
  export * from '../src/core/renderers/webgl/WebGlCoreShader.js';
84
+ export * from '../src/core/renderers/webgl/shaders/effects/ShaderEffect.js';
84
85
  // Textures
85
86
  export * from '../src/core/textures/Texture.js';
86
87
  // Text Rendering & Fonts
@@ -1 +1 @@
1
- {"version":3,"file":"core-api.js","sourceRoot":"","sources":["../../exports/core-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AAEH,UAAU;AACV,cAAc,gDAAgD,CAAC;AAE/D,WAAW;AACX,cAAc,iCAAiC,CAAC;AAEhD,yBAAyB;AACzB,cAAc,sDAAsD,CAAC;AACrE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,yEAAyE,CAAC;AACxF,cAAc,0DAA0D,CAAC;AACzE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,2EAA2E,CAAC;AAE1F,kBAAkB;AAClB,cAAc,8BAA8B,CAAC"}
1
+ {"version":3,"file":"core-api.js","sourceRoot":"","sources":["../../exports/core-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AAEH,UAAU;AACV,cAAc,gDAAgD,CAAC;AAC/D,cAAc,6DAA6D,CAAC;AAE5E,WAAW;AACX,cAAc,iCAAiC,CAAC;AAEhD,yBAAyB;AACzB,cAAc,sDAAsD,CAAC;AACrE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,yEAAyE,CAAC;AACxF,cAAc,0DAA0D,CAAC;AACzE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,2EAA2E,CAAC;AAE1F,kBAAkB;AAClB,cAAc,8BAA8B,CAAC"}
@@ -26,3 +26,4 @@ export * from '../src/common/IAnimationController.js';
26
26
  export * from '../src/common/CommonTypes.js';
27
27
  export type { TextRendererMap } from '../src/core/text-rendering/renderers/TextRenderer.js';
28
28
  export type { TrFontFaceMap } from '../src/core/text-rendering/font-face-types/TrFontFace.js';
29
+ export type { AnimationSettings } from '../src/core/animations/CoreAnimation.js';
@@ -3,9 +3,20 @@ import type { CoreRenderer } from './renderers/CoreRenderer.js';
3
3
  import type { CoreShader } from './renderers/CoreShader.js';
4
4
  import { DefaultShader } from './renderers/webgl/shaders/DefaultShader.js';
5
5
  import { DefaultShaderBatched } from './renderers/webgl/shaders/DefaultShaderBatched.js';
6
- import { DynamicShader } from './renderers/webgl/shaders/DynamicShader.js';
6
+ import { DynamicShader, type DynamicShaderProps } from './renderers/webgl/shaders/DynamicShader.js';
7
7
  import { RoundedRectangle } from './renderers/webgl/shaders/RoundedRectangle.js';
8
8
  import { SdfShader } from './renderers/webgl/shaders/SdfShader.js';
9
+ import { RadiusEffect } from './renderers/webgl/shaders/effects/RadiusEffect.js';
10
+ import { BorderEffect } from './renderers/webgl/shaders/effects/BorderEffect.js';
11
+ import { LinearGradientEffect } from './renderers/webgl/shaders/effects/LinearGradientEffect.js';
12
+ import { GrayscaleEffect } from './renderers/webgl/shaders/effects/GrayscaleEffect.js';
13
+ import { BorderRightEffect } from './renderers/webgl/shaders/effects/BorderRightEffect.js';
14
+ import { BorderTopEffect } from './renderers/webgl/shaders/effects/BorderTopEffect.js';
15
+ import { BorderBottomEffect } from './renderers/webgl/shaders/effects/BorderBottomEffect.js';
16
+ import { BorderLeftEffect } from './renderers/webgl/shaders/effects/BorderLeftEffect.js';
17
+ import { GlitchEffect } from './renderers/webgl/shaders/effects/GlitchEffect.js';
18
+ import { FadeOutEffect } from './renderers/webgl/shaders/effects/FadeOutEffect.js';
19
+ import { RadialGradientEffect } from './renderers/webgl/shaders/effects/RadialGradientEffect.js';
9
20
  export interface ShaderMap {
10
21
  DefaultShader: typeof DefaultShader;
11
22
  DefaultShaderBatched: typeof DefaultShaderBatched;
@@ -17,13 +28,29 @@ export type ShaderNode<Type extends keyof ShaderMap> = {
17
28
  shader: InstanceType<ShaderMap[Type]>;
18
29
  props: Record<string, unknown>;
19
30
  };
31
+ export interface EffectMap {
32
+ radius: typeof RadiusEffect;
33
+ border: typeof BorderEffect;
34
+ borderBottom: typeof BorderBottomEffect;
35
+ borderLeft: typeof BorderLeftEffect;
36
+ borderRight: typeof BorderRightEffect;
37
+ borderTop: typeof BorderTopEffect;
38
+ fadeOut: typeof FadeOutEffect;
39
+ linearGradient: typeof LinearGradientEffect;
40
+ radialGradient: typeof RadialGradientEffect;
41
+ grayscale: typeof GrayscaleEffect;
42
+ glitch: typeof GlitchEffect;
43
+ }
20
44
  export declare class CoreShaderManager {
21
45
  protected shCache: Map<string, InstanceType<ShaderMap[keyof ShaderMap]>>;
22
46
  protected shConstructors: Partial<ShaderMap>;
23
47
  protected attachedShader: CoreShader | null;
48
+ protected effectConstructors: Partial<EffectMap>;
24
49
  renderer: CoreRenderer;
25
50
  constructor();
26
51
  registerShaderType<Type extends keyof ShaderMap>(shType: Type, shClass: ShaderMap[Type]): void;
52
+ registerEffectType<Type extends keyof EffectMap>(effectType: Type, effectClass: EffectMap[Type]): void;
27
53
  loadShader<Type extends keyof ShaderMap>(shType: Type, props?: ExtractProps<ShaderMap[Type]>): ShaderNode<Type>;
54
+ loadDynamicShader<Type extends keyof ShaderMap>(props: DynamicShaderProps): ShaderNode<Type>;
28
55
  useShader(shader: CoreShader): void;
29
56
  }
@@ -1,12 +1,24 @@
1
1
  import { DefaultShader } from './renderers/webgl/shaders/DefaultShader.js';
2
2
  import { DefaultShaderBatched } from './renderers/webgl/shaders/DefaultShaderBatched.js';
3
- import { DynamicShader } from './renderers/webgl/shaders/DynamicShader.js';
3
+ import { DynamicShader, } from './renderers/webgl/shaders/DynamicShader.js';
4
4
  import { RoundedRectangle } from './renderers/webgl/shaders/RoundedRectangle.js';
5
5
  import { SdfShader } from './renderers/webgl/shaders/SdfShader.js';
6
+ import { RadiusEffect } from './renderers/webgl/shaders/effects/RadiusEffect.js';
7
+ import { BorderEffect } from './renderers/webgl/shaders/effects/BorderEffect.js';
8
+ import { LinearGradientEffect } from './renderers/webgl/shaders/effects/LinearGradientEffect.js';
9
+ import { GrayscaleEffect } from './renderers/webgl/shaders/effects/GrayscaleEffect.js';
10
+ import { BorderRightEffect } from './renderers/webgl/shaders/effects/BorderRightEffect.js';
11
+ import { BorderTopEffect } from './renderers/webgl/shaders/effects/BorderTopEffect.js';
12
+ import { BorderBottomEffect } from './renderers/webgl/shaders/effects/BorderBottomEffect.js';
13
+ import { BorderLeftEffect } from './renderers/webgl/shaders/effects/BorderLeftEffect.js';
14
+ import { GlitchEffect } from './renderers/webgl/shaders/effects/GlitchEffect.js';
15
+ import { FadeOutEffect } from './renderers/webgl/shaders/effects/FadeOutEffect.js';
16
+ import { RadialGradientEffect } from './renderers/webgl/shaders/effects/RadialGradientEffect.js';
6
17
  export class CoreShaderManager {
7
18
  shCache = new Map();
8
19
  shConstructors = {};
9
20
  attachedShader = null;
21
+ effectConstructors = {};
10
22
  renderer;
11
23
  constructor() {
12
24
  this.registerShaderType('DefaultShader', DefaultShader);
@@ -14,10 +26,24 @@ export class CoreShaderManager {
14
26
  this.registerShaderType('RoundedRectangle', RoundedRectangle);
15
27
  this.registerShaderType('DynamicShader', DynamicShader);
16
28
  this.registerShaderType('SdfShader', SdfShader);
29
+ this.registerEffectType('border', BorderEffect);
30
+ this.registerEffectType('borderBottom', BorderBottomEffect);
31
+ this.registerEffectType('borderLeft', BorderLeftEffect);
32
+ this.registerEffectType('borderRight', BorderRightEffect);
33
+ this.registerEffectType('borderTop', BorderTopEffect);
34
+ this.registerEffectType('fadeOut', FadeOutEffect);
35
+ this.registerEffectType('linearGradient', LinearGradientEffect);
36
+ this.registerEffectType('radialGradient', RadialGradientEffect);
37
+ this.registerEffectType('grayscale', GrayscaleEffect);
38
+ this.registerEffectType('glitch', GlitchEffect);
39
+ this.registerEffectType('radius', RadiusEffect);
17
40
  }
18
41
  registerShaderType(shType, shClass) {
19
42
  this.shConstructors[shType] = shClass;
20
43
  }
44
+ registerEffectType(effectType, effectClass) {
45
+ this.effectConstructors[effectType] = effectClass;
46
+ }
21
47
  loadShader(shType, props) {
22
48
  if (!this.renderer) {
23
49
  throw new Error(`Renderer is not been defined`);
@@ -26,6 +52,9 @@ export class CoreShaderManager {
26
52
  if (!ShaderClass) {
27
53
  throw new Error(`Shader type "${shType}" is not registered`);
28
54
  }
55
+ if (shType === 'DynamicShader') {
56
+ return this.loadDynamicShader(props);
57
+ }
29
58
  const resolvedProps = ShaderClass.resolveDefaults(props);
30
59
  const cacheKey = ShaderClass.makeCacheKey(resolvedProps) || ShaderClass.name;
31
60
  if (cacheKey && this.shCache.has(cacheKey)) {
@@ -44,6 +73,27 @@ export class CoreShaderManager {
44
73
  props: resolvedProps,
45
74
  };
46
75
  }
76
+ loadDynamicShader(props) {
77
+ if (!this.renderer) {
78
+ throw new Error(`Renderer is not been defined`);
79
+ }
80
+ const resolvedProps = DynamicShader.resolveDefaults(props, this.effectConstructors);
81
+ const cacheKey = DynamicShader.makeCacheKey(resolvedProps, this.effectConstructors);
82
+ if (cacheKey && this.shCache.has(cacheKey)) {
83
+ return {
84
+ shader: this.shCache.get(cacheKey),
85
+ props: resolvedProps,
86
+ };
87
+ }
88
+ const shader = new DynamicShader(this.renderer, props, this.effectConstructors);
89
+ if (cacheKey) {
90
+ this.shCache.set(cacheKey, shader);
91
+ }
92
+ return {
93
+ shader: shader,
94
+ props: resolvedProps,
95
+ };
96
+ }
47
97
  useShader(shader) {
48
98
  if (this.attachedShader === shader) {
49
99
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"CoreShaderManager.js","sourceRoot":"","sources":["../../../src/core/CoreShaderManager.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAenE,MAAM,OAAO,iBAAiB;IAClB,OAAO,GACf,IAAI,GAAG,EAAE,CAAC;IACF,cAAc,GAAuB,EAAE,CAAC;IACxC,cAAc,GAAsB,IAAI,CAAC;IAEnD,QAAQ,CAAgB;IAExB;QACE,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;QAC9D,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC;IAED,kBAAkB,CAChB,MAAY,EACZ,OAAwB;QAExB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;IACxC,CAAC;IAED,UAAU,CACR,MAAY,EACZ,KAAqC;QAErC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,gBAAgB,MAAgB,qBAAqB,CAAC,CAAC;SACxE;QACD,MAAM,aAAa,GAAG,WAAW,CAAC,eAAe,CAC/C,KAAgC,CACjC,CAAC;QACF,MAAM,QAAQ,GACZ,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;QAC9D,IAAI,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC1C,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAkC;gBACnE,KAAK,EAAE,aAAa;aACrB,CAAC;SACH;QAED,sDAAsD;QACtD,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAElD,CAAC;QACF,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACpC;QACD,OAAO;YACL,MAAM;YACN,KAAK,EAAE,aAAa;SACrB,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,MAAkB;QAC1B,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,EAAE;YAClC,OAAO;SACR;QACD,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;SAC9B;QACD,MAAM,CAAC,MAAM,EAAE,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC/B,CAAC;CACF"}
1
+ {"version":3,"file":"CoreShaderManager.js","sourceRoot":"","sources":["../../../src/core/CoreShaderManager.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import type { CoreNode } from '../CoreNode.js';
2
2
  import type { INodeAnimatableProps } from '../../main-api/INode.js';
3
3
  import { EventEmitter } from '../../common/EventEmitter.js';
4
- export interface IAnimationSettings {
4
+ export interface AnimationSettings {
5
5
  duration: number;
6
6
  delay: number;
7
7
  easing: string;
@@ -13,12 +13,12 @@ export interface IAnimationSettings {
13
13
  export declare class CoreAnimation extends EventEmitter {
14
14
  private node;
15
15
  private props;
16
- settings: Partial<IAnimationSettings>;
16
+ settings: Partial<AnimationSettings>;
17
17
  propStartValues: Partial<INodeAnimatableProps>;
18
18
  restoreValues: Partial<INodeAnimatableProps>;
19
19
  private progress;
20
20
  private timingFunction;
21
- constructor(node: CoreNode, props: Partial<INodeAnimatableProps>, settings: Partial<IAnimationSettings>);
21
+ constructor(node: CoreNode, props: Partial<INodeAnimatableProps>, settings: Partial<AnimationSettings>);
22
22
  reset(): void;
23
23
  restore(): void;
24
24
  reverse(): void;
@@ -55,20 +55,21 @@ export class CoreAnimation extends EventEmitter {
55
55
  this.progress = 0;
56
56
  Object.keys(this.props).forEach((propName) => {
57
57
  // set the start value to the current value
58
- const startValue = this.node[propName];
58
+ const startValue = this.props[propName];
59
59
  const endValue = this.propStartValues[propName];
60
60
  // swap the start and end values
61
61
  this.props[propName] = endValue;
62
62
  this.propStartValues[propName] = startValue;
63
63
  });
64
- // restore stop method
65
- this.settings.stopMethod = false;
64
+ // restore stop method if we are not looping
65
+ if (!this.settings.loop) {
66
+ this.settings.stopMethod = false;
67
+ }
66
68
  }
67
69
  applyEasing(p, s, e) {
68
70
  return (this.timingFunction(p) || p) * (e - s) + s;
69
71
  }
70
72
  update(dt) {
71
- // finish if no duration is provided
72
73
  const { duration, loop, easing } = this.settings;
73
74
  if (!duration) {
74
75
  this.emit('finished', {});
@@ -1 +1 @@
1
- {"version":3,"file":"CoreAnimation.js","sourceRoot":"","sources":["../../../../src/core/animations/CoreAnimation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CoreAnimation.js","sourceRoot":"","sources":["../../../../src/core/animations/CoreAnimation.ts"],"names":[],"mappings":"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"}
@@ -24,8 +24,8 @@ export class WebGlCoreCtxSubTexture extends WebGlCoreCtxTexture {
24
24
  async onLoadRequest() {
25
25
  const props = await this.textureSource.getTextureData();
26
26
  return {
27
- width: props.width || 0,
28
- height: props.height || 0,
27
+ width: props.data?.width || 0,
28
+ height: props.data?.height || 0,
29
29
  };
30
30
  }
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"WebGlCoreCtxSubTexture.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreCtxSubTexture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,OAAO,sBAAuB,SAAQ,mBAAmB;IAC7D,YAAY,EAAyB,EAAE,aAAyB;QAC9D,KAAK,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAC3B,CAAC;IAEQ,KAAK,CAAC,aAAa;QAC1B,MAAM,KAAK,GAAG,MAAO,IAAI,CAAC,aAA4B,CAAC,cAAc,EAAE,CAAC;QACxE,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,CAAC;YACvB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC;SAC1B,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"WebGlCoreCtxSubTexture.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreCtxSubTexture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,OAAO,sBAAuB,SAAQ,mBAAmB;IAC7D,YAAY,EAAyB,EAAE,aAAyB;QAC9D,KAAK,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAC3B,CAAC;IAEQ,KAAK,CAAC,aAAa;QAC1B,MAAM,KAAK,GAAG,MAAO,IAAI,CAAC,aAA4B,CAAC,cAAc,EAAE,CAAC;QACxE,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC;YAC7B,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;SAChC,CAAC;IACJ,CAAC;CACF"}
@@ -109,17 +109,20 @@ export class WebGlCoreCtxTexture extends CoreContextTexture {
109
109
  assertTruthy(this._nativeCtxTexture);
110
110
  // If textureData is null, the texture is empty (0, 0) and we don't need to
111
111
  // upload any data to the GPU.
112
- if (textureData instanceof ImageBitmap) {
113
- width = textureData.width;
114
- height = textureData.height;
112
+ if (textureData.data instanceof ImageBitmap ||
113
+ textureData.data instanceof ImageData) {
114
+ const data = textureData.data;
115
+ width = data.width;
116
+ height = data.height;
115
117
  gl.bindTexture(gl.TEXTURE_2D, this._nativeCtxTexture);
116
- gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, textureData);
118
+ gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, !!textureData.premultiplyAlpha);
119
+ gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, data);
117
120
  // generate mipmaps for power-of-2 textures or in WebGL2RenderingContext
118
121
  if (isWebGl2(gl) || (isPowerOfTwo(width) && isPowerOfTwo(height))) {
119
122
  gl.generateMipmap(gl.TEXTURE_2D);
120
123
  }
121
124
  }
122
- else if (textureData === null) {
125
+ else if (textureData.data === null) {
123
126
  width = 0;
124
127
  height = 0;
125
128
  // Reset to a 1x1 transparent texture
@@ -1 +1 @@
1
- {"version":3,"file":"WebGlCoreCtxTexture.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreCtxTexture.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebGlCoreCtxTexture.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreCtxTexture.ts"],"names":[],"mappings":"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"}
@@ -101,11 +101,11 @@ export class WebGlCoreShader extends CoreShader {
101
101
  [...options.attributes].forEach((attributeName) => {
102
102
  const location = gl.getAttribLocation(this.program, attributeName);
103
103
  if (location < 0) {
104
- throw new Error(`Vertex shader must have an attribute "${attributeName}"!`);
104
+ throw new Error(`${this.constructor.name}: Vertex shader must have an attribute "${attributeName}"!`);
105
105
  }
106
106
  const buffer = gl.createBuffer();
107
107
  if (!buffer) {
108
- throw new Error(`Could not create buffer for attribute "${attributeName}"`);
108
+ throw new Error(`${this.constructor.name}: Could not create buffer for attribute "${attributeName}"`);
109
109
  }
110
110
  this.attributeLocations[attributeName] = location;
111
111
  this.attributeBuffers[attributeName] = buffer;
@@ -1 +1 @@
1
- {"version":3,"file":"WebGlCoreShader.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreShader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAK9C,OAAO,EACL,aAAa,EACb,YAAY,GAMb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AA+BpD,MAAM,OAAgB,eAAgB,SAAQ,UAAU;IAC5C,qBAAqB,GAA4B,IAAI,CAAC;IACtD,YAAY,GAAG,KAAK,CAAC;IACrB,OAAO,CAAe;IAChC;;;;;OAKG;IACO,GAAG,CAAqC;IACxC,QAAQ,CAAoB;IAC5B,EAAE,CAAwB;IAC1B,gBAAgB,CAA8B;IAC9C,kBAAkB,CAAyB;IAC3C,cAAc,CAAW;IACzB,gBAAgB,CAAuC;IACvD,YAAY,CAAyC;IACtD,uBAAuB,CAAU;IAE1C,YAAY,OAAsB;QAChC,KAAK,EAAE,CAAC;QACR,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,KAAK,CAAC;QAExE,sCAAsC;QACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,kBAAkB,GACtB,CAAC,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;YACpC,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;YACrC,EAAE,CAAC;QACL,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QACzC,kBAAkB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC3C,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,yBAAyB,aAAa,eAAe,SAAS,mBAAmB,CAClH,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,0FAA0F;QAC1F,yCAAyC;QACzC,wGAAwG;QACxG,kBAAkB;QAClB,MAAM,aAAa,GACjB,OAAO,CAAC,aAAa;YACpB,IAAI,CAAC,WAAsC,CAAC,aAAa,CAAC;QAC7D,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,6BAA6B,CAC9D,CAAC;SACH;aAAM,IAAI,MAAM,IAAI,aAAa,EAAE,MAAM,EAAE;YAC1C,aAAa,CAAC,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;YACvD,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;YACnD,OAAO,aAAa,CAAC,MAAM,CAAC;SAC7B;QAED,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAE5D,MAAM,YAAY,GAChB,aAAa,CAAC,MAAM,YAAY,QAAQ;YACtC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC;YACpC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;QAE3B,MAAM,cAAc,GAClB,aAAa,CAAC,QAAQ,YAAY,QAAQ;YACxC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC;YACtC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;QAE7B,MAAM,YAAY,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE;YACpC,MAAM,IAAI,KAAK,EAAE,CAAC;SACnB;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,EAAE,CAAC;SACnB;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,EAAE,CAAC;aACnB;YACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YAEf,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,kBAAkB,GAAG,EAA4B,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,EAA4B,CAAC;QACrD,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACnE,IAAI,QAAQ,GAAG,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CACb,yCAAyC,aAAa,IAAI,CAC3D,CAAC;aACH;YACD,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,0CAA0C,aAAa,GAAG,CAC3D,CAAC;aACH;YAED,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;YAClD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,EAA2C,CAAC;QACpE,IAAI,CAAC,YAAY,GAAG,EAA4C,CAAC;QACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAoB,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;YAClD,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,CAAC,IAAI,CACV,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,yCAAyC,OAAO,CAAC,IAAI,GAAG,CACzF,CAAC;gBACF,OAAO;aACR;YACD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CACzB,QAAgB,EAChB,MAAmB,EACnB,SAAwB;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,EAAE,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAErC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAEvC,EAAE,CAAC,mBAAmB,CACpB,QAAQ,EACR,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,MAAM,CACjB,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC/B,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,iBAAiB;QACf,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAW,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACpC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CACjB,MAA+B,EAC/B,MAA+B;QAE/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,YAAY,CACV,QAA2B,EAC3B,KAAqC;QAErC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACtC;QACD,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;QACxB,mCAAmC;QACnC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;QAC5E,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,IAAI,KAAK,EAAE;YACT,mCAAmC;YACnC,+DAA+D;YAC/D,IAAI,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE;gBAChC,IAAI,UAAU,GAAG,KAAK,CAAC,WAAgC,CAAC;gBACxD,IAAI,CAAC,UAAU,EAAE;oBACf,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;iBAClC;gBACD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aACxE;YACD,IAAI,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAC,MAAuB,CAAC;gBAC1C,IAAI,CAAC,KAAK,EAAE;oBACV,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;iBACxB;gBACD,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;aACnC;YACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,KAAU;QACjC,iEAAiE;QACjE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,oBAAoB,CAAC,MAAwB;QAC3C,IAAI,IAAI,CAAC,qBAAqB,KAAK,MAAM,EAAE;YACzC,OAAO;SACR;QACD,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACnD,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC5D,YAAY,CAAC,cAAc,EAAE,eAAe,aAAa,aAAa,CAAC,CAAC;YACxE,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,IAAI,CAAC,mBAAmB,CACtB,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAE,EACvC,cAAc,EACd,YAAY,CACb,CAAC;SACH;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC;IACtC,CAAC;IAEkB,SAAS,CAAC,KAA8B;QACzD,2BAA2B;IAC7B,CAAC;IAED,YAAY,CAAC,QAA+B;QAC1C,cAAc;IAChB,CAAC;IAEQ,MAAM;QACb,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnC;IACH,CAAC;IAEQ,MAAM;QACb,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAES,MAAM,CAAC,aAAa,CAAwB;CACvD"}
1
+ {"version":3,"file":"WebGlCoreShader.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreShader.ts"],"names":[],"mappings":"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"}
@@ -3,18 +3,8 @@ import type { WebGlCoreRenderer } from '../WebGlCoreRenderer.js';
3
3
  import { WebGlCoreShader, type DimensionsShaderProp, type AlphaShaderProp } from '../WebGlCoreShader.js';
4
4
  import type { UniformInfo } from '../internal/ShaderUtils.js';
5
5
  import type { WebGlCoreCtxTexture } from '../WebGlCoreCtxTexture.js';
6
- import { RadiusEffect } from './effects/RadiusEffect.js';
7
- import { BorderEffect } from './effects/BorderEffect.js';
8
- import { LinearGradientEffect } from './effects/LinearGradientEffect.js';
9
- import { GrayscaleEffect } from './effects/GrayscaleEffect.js';
10
6
  import { ShaderEffect } from './effects/ShaderEffect.js';
11
- import { BorderRightEffect } from './effects/BorderRightEffect.js';
12
- import { BorderTopEffect } from './effects/BorderTopEffect.js';
13
- import { BorderBottomEffect } from './effects/BorderBottomEffect.js';
14
- import { BorderLeftEffect } from './effects/BorderLeftEffect.js';
15
- import { GlitchEffect } from './effects/GlitchEffect.js';
16
- import { FadeOutEffect } from './effects/FadeOutEffect.js';
17
- import { RadialGradientEffect } from './effects/RadialGradientEffect.js';
7
+ import type { EffectMap } from '../../../CoreShaderManager.js';
18
8
  /**
19
9
  * Allows the `keyof EffectMap` to be mapped over and form an discriminated
20
10
  * union of all the EffectDescs structures individually.
@@ -52,37 +42,24 @@ type EffectDesc = MapEffectDescs<keyof EffectMap>;
52
42
  export interface DynamicShaderProps extends DimensionsShaderProp, AlphaShaderProp {
53
43
  effects?: EffectDesc[];
54
44
  }
55
- export interface EffectMap {
56
- radius: typeof RadiusEffect;
57
- border: typeof BorderEffect;
58
- borderBottom: typeof BorderBottomEffect;
59
- borderLeft: typeof BorderLeftEffect;
60
- borderRight: typeof BorderRightEffect;
61
- borderTop: typeof BorderTopEffect;
62
- fadeOut: typeof FadeOutEffect;
63
- linearGradient: typeof LinearGradientEffect;
64
- radialGradient: typeof RadialGradientEffect;
65
- grayscale: typeof GrayscaleEffect;
66
- glitch: typeof GlitchEffect;
67
- }
68
45
  export interface SpecificEffectDesc<FxType extends keyof EffectMap = keyof EffectMap> {
69
46
  type: FxType;
70
47
  props?: ExtractProps<EffectMap[FxType]>;
71
48
  }
72
49
  export declare class DynamicShader extends WebGlCoreShader {
73
50
  effects: Array<InstanceType<EffectMap[keyof EffectMap]>>;
74
- constructor(renderer: WebGlCoreRenderer, props: DynamicShaderProps);
51
+ constructor(renderer: WebGlCoreRenderer, props: DynamicShaderProps, effectContructors: Partial<EffectMap>);
75
52
  bindTextures(textures: WebGlCoreCtxTexture[]): void;
76
53
  protected bindProps(props: Required<DynamicShaderProps>): void;
77
- static createShader(props: DynamicShaderProps): {
54
+ static createShader(props: DynamicShaderProps, effectContructors: Partial<EffectMap>): {
78
55
  effects: ShaderEffect[];
79
56
  uniforms: UniformInfo[];
80
57
  fragment: string;
81
58
  vertex: string;
82
59
  };
83
60
  static resolveMethodDuplicate(key: string, effectMethod: string, methodCollection: Record<string, string>, increment?: number): string;
84
- static resolveDefaults(props: DynamicShaderProps): Required<DynamicShaderProps>;
85
- static makeCacheKey(props: DynamicShaderProps): string;
61
+ static resolveDefaults(props: DynamicShaderProps, effectContructors?: Partial<EffectMap>): Required<DynamicShaderProps>;
62
+ static makeCacheKey(props: DynamicShaderProps, effectContructors?: Partial<EffectMap>): string;
86
63
  static z$__type__Props: DynamicShaderProps;
87
64
  static vertex: () => string;
88
65
  static fragment: (uniforms: string, methods: string, effectMethods: string, drawEffects: string) => string;
@@ -26,8 +26,8 @@ const Effects = {
26
26
  };
27
27
  export class DynamicShader extends WebGlCoreShader {
28
28
  effects = [];
29
- constructor(renderer, props) {
30
- const shader = DynamicShader.createShader(props);
29
+ constructor(renderer, props, effectContructors) {
30
+ const shader = DynamicShader.createShader(props, effectContructors);
31
31
  super({
32
32
  renderer,
33
33
  attributes: ['a_position', 'a_textureCoordinate', 'a_color'],
@@ -70,7 +70,7 @@ export class DynamicShader extends WebGlCoreShader {
70
70
  });
71
71
  });
72
72
  }
73
- static createShader(props) {
73
+ static createShader(props, effectContructors) {
74
74
  //counts duplicate effects
75
75
  const effectNameCount = {};
76
76
  const methods = {};
@@ -78,7 +78,7 @@ export class DynamicShader extends WebGlCoreShader {
78
78
  const uniforms = [];
79
79
  const uFx = [];
80
80
  const effects = props.effects.map((effect) => {
81
- const baseClass = Effects[effect.type];
81
+ const baseClass = effectContructors[effect.type];
82
82
  const key = baseClass.getEffectKey(effect.props || {});
83
83
  effectNameCount[key] = effectNameCount[key] ? ++effectNameCount[key] : 1;
84
84
  const nr = effectNameCount[key];
@@ -98,7 +98,7 @@ export class DynamicShader extends WebGlCoreShader {
98
98
  //build source
99
99
  let effectMethods = '';
100
100
  uFx?.forEach((fx) => {
101
- const fxClass = Effects[fx.type];
101
+ const fxClass = effectContructors[fx.type];
102
102
  const fxProps = fxClass.resolveDefaults((fx.props ?? {}));
103
103
  const remap = [];
104
104
  for (const m in fxClass.methods) {
@@ -204,11 +204,11 @@ export class DynamicShader extends WebGlCoreShader {
204
204
  }
205
205
  return m;
206
206
  }
207
- static resolveDefaults(props) {
207
+ static resolveDefaults(props, effectContructors) {
208
208
  return {
209
209
  effects: (props.effects ?? []).map((effect) => ({
210
210
  type: effect.type,
211
- props: Effects[effect.type].resolveDefaults(effect.props || {}),
211
+ props: effectContructors[effect.type].resolveDefaults(effect.props || {}),
212
212
  })),
213
213
  $dimensions: {
214
214
  width: 0,
@@ -217,10 +217,10 @@ export class DynamicShader extends WebGlCoreShader {
217
217
  $alpha: 0,
218
218
  };
219
219
  }
220
- static makeCacheKey(props) {
220
+ static makeCacheKey(props, effectContructors) {
221
221
  let fx = '';
222
222
  props.effects?.forEach((effect) => {
223
- const baseClass = Effects[effect.type];
223
+ const baseClass = effectContructors[effect.type];
224
224
  const key = baseClass.getEffectKey(effect.props || {});
225
225
  fx += `,${key}`;
226
226
  });
@@ -1 +1 @@
1
- {"version":3,"file":"DynamicShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DynamicShader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DynamicShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DynamicShader.ts"],"names":[],"mappings":"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"}
@@ -25,12 +25,7 @@ export class RoundedRectangle extends WebGlCoreShader {
25
25
  constructor(renderer) {
26
26
  super({
27
27
  renderer,
28
- attributes: [
29
- 'a_position',
30
- 'a_textureCoordinate',
31
- 'a_color',
32
- 'a_textureIndex',
33
- ],
28
+ attributes: ['a_position', 'a_textureCoordinate', 'a_color'],
34
29
  uniforms: [
35
30
  { name: 'u_resolution', uniform: 'uniform2fv' },
36
31
  { name: 'u_pixelRatio', uniform: 'uniform1f' },
@@ -82,7 +77,6 @@ export class RoundedRectangle extends WebGlCoreShader {
82
77
 
83
78
  varying vec4 v_color;
84
79
  varying vec2 v_textureCoordinate;
85
- varying float v_textureIndex;
86
80
 
87
81
  void main() {
88
82
  vec2 normalized = a_position * u_pixelRatio / u_resolution;
@@ -92,7 +86,6 @@ export class RoundedRectangle extends WebGlCoreShader {
92
86
  // pass to fragment
93
87
  v_color = a_color;
94
88
  v_textureCoordinate = a_textureCoordinate;
95
- v_textureIndex = a_textureIndex;
96
89
 
97
90
  // flip y
98
91
  gl_Position = vec4(clip_space * vec2(1.0, -1.0), 0, 1);
@@ -1 +1 @@
1
- {"version":3,"file":"RoundedRectangle.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/RoundedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,eAAe,GAEhB,MAAM,uBAAuB,CAAC;AAgB/B;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,eAAe;IACnD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE;gBACV,YAAY;gBACZ,qBAAqB;gBACrB,SAAS;gBACT,gBAAgB;aACjB;YACD,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC3C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE;aAC3C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAwB;IAE9C,MAAM,CAAU,eAAe,CAC7B,KAA4B;QAE5B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YAC1B,WAAW,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;aACV;SACF,CAAC;IACJ,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAEkB,SAAS,CAAC,KAAsC;QACjE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEQ,mBAAmB,CAC1B,MAAuC,EACvC,MAAuC;QAEvC,OAAO,CACL,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAC/B,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,CAAC,KAAK;YACrD,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCT;KACF,CAAC"}
1
+ {"version":3,"file":"RoundedRectangle.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/RoundedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,eAAe,GAEhB,MAAM,uBAAuB,CAAC;AAgB/B;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,eAAe;IACnD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC3C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE;aAC3C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAwB;IAE9C,MAAM,CAAU,eAAe,CAC7B,KAA4B;QAE5B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YAC1B,WAAW,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;aACV;SACF,CAAC;IACJ,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAEkB,SAAS,CAAC,KAAsC;QACjE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEQ,mBAAmB,CAC1B,MAAuC,EACvC,MAAuC;QAEvC,OAAO,CACL,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAC/B,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,CAAC,KAAK;YACrD,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCT;KACF,CAAC"}