@safe-engine/pixi 8.4.3 → 8.4.7

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 (43) hide show
  1. package/dist/app.d.ts +2 -2
  2. package/dist/app.d.ts.map +1 -1
  3. package/dist/base/EnhancedComponent.d.ts +3 -2
  4. package/dist/base/EnhancedComponent.d.ts.map +1 -1
  5. package/dist/base/EnhancedComponent.js +1 -1
  6. package/dist/components/NodeComp.d.ts +1 -0
  7. package/dist/components/NodeComp.d.ts.map +1 -1
  8. package/dist/components/NodeComp.js +11 -1
  9. package/dist/core/loader.d.ts +2 -1
  10. package/dist/core/loader.d.ts.map +1 -1
  11. package/dist/core/loader.js +2 -3
  12. package/dist/gui/GUIComponent.d.ts +17 -15
  13. package/dist/gui/GUIComponent.d.ts.map +1 -1
  14. package/dist/gui/GUIComponent.js +2 -9
  15. package/dist/gui/GUISystem.d.ts.map +1 -1
  16. package/dist/gui/GUISystem.js +13 -10
  17. package/dist/norender/Touch.d.ts +2 -20
  18. package/dist/norender/Touch.d.ts.map +1 -1
  19. package/dist/norender/Touch.js +1 -1
  20. package/dist/render/RenderComponent.d.ts +6 -10
  21. package/dist/render/RenderComponent.d.ts.map +1 -1
  22. package/dist/richtext/RichTextComp.d.ts +2 -1
  23. package/dist/richtext/RichTextComp.d.ts.map +1 -1
  24. package/dist/richtext/RichTextComp.js +1 -1
  25. package/dist/spine/SpineComponent.d.ts +5 -3
  26. package/dist/spine/SpineComponent.d.ts.map +1 -1
  27. package/dist/spine/SpineComponent.js +1 -1
  28. package/dist/spine/lib/Spine.d.ts +2 -2
  29. package/dist/spine/lib/Spine.d.ts.map +1 -1
  30. package/dist/spine/lib/Spine.js +19 -20
  31. package/package.json +5 -5
  32. package/src/app.ts +2 -2
  33. package/src/base/EnhancedComponent.ts +4 -3
  34. package/src/components/NodeComp.ts +9 -1
  35. package/src/core/loader.ts +7 -5
  36. package/src/gui/GUIComponent.ts +31 -35
  37. package/src/gui/GUISystem.ts +12 -9
  38. package/src/norender/Touch.ts +3 -3
  39. package/src/render/RenderComponent.ts +17 -17
  40. package/src/richtext/RichTextComp.ts +10 -6
  41. package/src/spine/SpineComponent.ts +5 -5
  42. package/src/spine/lib/Spine.ts +313 -329
  43. package/src/@types/safex.d.ts +0 -15
package/dist/app.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { Application, AssetsClass } from 'pixi.js';
1
+ import { Application, AssetsClass, Renderer } from 'pixi.js';
2
2
  export declare function startGame(defaultFont: any, designedResolution: {
3
3
  width: number;
4
4
  height: number;
5
- }, assetManager: AssetsClass, id?: string): Promise<Application<import("pixi.js").Renderer>>;
5
+ }, assetManager: AssetsClass, id?: string): Promise<Application<Renderer>>;
6
6
  //# sourceMappingURL=app.d.ts.map
package/dist/app.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAQlD,wBAAsB,SAAS,CAC7B,WAAW,KAAA,EACX,kBAAkB;;;CAA+B,EACjD,YAAY,EAAE,WAAW,EACzB,EAAE,SAAe,oDA+BlB"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQ5D,wBAAsB,SAAS,CAC7B,WAAW,KAAA,EACX,kBAAkB;;;CAA+B,EACjD,YAAY,EAAE,WAAW,EACzB,EAAE,SAAe,GAChB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CA8BhC"}
@@ -1,9 +1,10 @@
1
1
  import { Constructor } from 'entityx-ts';
2
- import { BaseComponentProps } from '../@types/safex';
2
+ import { BaseComponentProps } from '..';
3
3
  import { NodeComp } from '../components/NodeComp';
4
4
  export declare class EnhancedComponent<Props = {}, N extends NodeComp<any> = NodeComp<any>> {
5
5
  props: Props;
6
- constructor(data?: BaseComponentProps & Props);
6
+ enabled: boolean;
7
+ constructor(data?: BaseComponentProps<EnhancedComponent> & Props);
7
8
  init(data?: Props): void;
8
9
  node: N;
9
10
  addComponent<T extends EnhancedComponent>(instance: any): T;
@@ -1 +1 @@
1
- {"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,qBAAa,iBAAiB,CAAC,KAAK,GAAG,EAAE,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IAChF,KAAK,EAAE,KAAK,CAAY;gBACZ,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK;IAG7C,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IAQjB,IAAI,EAAE,CAAC,CAAA;IAEP,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,KAAA,GAAG,CAAC;IAGtD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}
1
+ {"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,qBAAa,iBAAiB,CAAC,KAAK,GAAG,EAAE,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IAChF,KAAK,EAAE,KAAK,CAAY;IACxB,OAAO,UAAO;gBACF,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IAQjB,IAAI,EAAE,CAAC,CAAA;IAEP,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,KAAA,GAAG,CAAC;IAGtD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}
@@ -1,6 +1,7 @@
1
1
  export class EnhancedComponent {
2
2
  constructor(data) {
3
3
  this.props = {};
4
+ this.enabled = true;
4
5
  this.init(data);
5
6
  }
6
7
  init(data) {
@@ -11,7 +12,6 @@ export class EnhancedComponent {
11
12
  });
12
13
  }
13
14
  }
14
- // actionsMap: { [key: string]: Animation } = {}
15
15
  addComponent(instance) {
16
16
  return this.node.addComponent(instance);
17
17
  }
@@ -23,6 +23,7 @@ export declare class NodeComp<C extends Container = Container> {
23
23
  actionsList: Animation[];
24
24
  name: string;
25
25
  private _group;
26
+ private _active;
26
27
  onTouchStart?: TouchEventCallback;
27
28
  onTouchMove?: TouchEventCallback;
28
29
  onTouchEnd?: TouchEventCallback;
@@ -1 +1 @@
1
- {"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"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"}
@@ -40,6 +40,7 @@ export class NodeComp {
40
40
  this.actionsList = [];
41
41
  // private lastMove: { x: number; y: number }
42
42
  this._group = 0;
43
+ this._active = true;
43
44
  this.entity = entity;
44
45
  this.instance = instance;
45
46
  this.instance.eventMode = 'static';
@@ -140,9 +141,18 @@ export class NodeComp {
140
141
  this.instance.alpha = val;
141
142
  }
142
143
  get active() {
144
+ if (!this._active)
145
+ return false;
146
+ let p = this.parent;
147
+ while (p) {
148
+ if (!p.active)
149
+ return false;
150
+ p = p.parent;
151
+ }
143
152
  return this.instance.visible && !this.instance.destroyed;
144
153
  }
145
154
  set active(val) {
155
+ this._active = val;
146
156
  this.instance.visible = val;
147
157
  }
148
158
  get group() {
@@ -250,7 +260,7 @@ export class NodeComp {
250
260
  }
251
261
  setScale(scaleX, scaleY) {
252
262
  this.instance.scale.x = scaleX;
253
- this.instance.scale.x = scaleY || scaleX;
263
+ this.instance.scale.y = scaleY || scaleX;
254
264
  }
255
265
  runAction(act) {
256
266
  const animation = actionManager.runAction(this.instance, act);
@@ -1,3 +1,4 @@
1
- export declare function loadJsonAsync<T>(filePath: string): Promise<T>;
1
+ import { AssetsClass } from 'pixi.js';
2
+ export declare function loadJsonAsync<T>(Assets: AssetsClass): (filePath: string) => Promise<T>;
2
3
  export declare function loadJsonFromCache<T>(filePath: string): T;
3
4
  //# sourceMappingURL=loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/core/loader.ts"],"names":[],"mappings":"AAGA,wBAAsB,aAAa,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAInE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAExD"}
1
+ {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/core/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGrC,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,IACpC,UAAU,MAAM,KAAG,OAAO,CAAC,CAAC,CAAC,CAK5C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAExD"}
@@ -7,10 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
- import { Assets } from 'pixi.js';
11
10
  const jsonCache = {};
12
- export function loadJsonAsync(filePath) {
13
- return __awaiter(this, void 0, void 0, function* () {
11
+ export function loadJsonAsync(Assets) {
12
+ return (filePath) => __awaiter(this, void 0, void 0, function* () {
14
13
  const json = yield Assets.load(filePath);
15
14
  jsonCache[filePath] = json;
16
15
  return json;
@@ -1,5 +1,6 @@
1
1
  import { CheckBox, CheckBoxOptions, Input, List, ProgressBar, RadioGroup, Slider, SliderOptions } from '@pixi/ui';
2
- import { Container, FillInput, Point, Text } from 'pixi.js';
2
+ import { Container, Point, Text } from 'pixi.js';
3
+ import { BaseComponentProps } from '..';
3
4
  import { ComponentX, NoRenderComponentX } from '../components/BaseComponent';
4
5
  import { Color4B } from '../core/Color';
5
6
  import { LoadingBarMode, ProgressTimer } from '../core/LoadingBar';
@@ -8,7 +9,7 @@ export declare const FillType: {
8
9
  VERTICAL: number;
9
10
  RADIAL: number;
10
11
  };
11
- interface ButtonCompProps {
12
+ interface ButtonCompProps extends BaseComponentProps<ButtonComp> {
12
13
  normalImage?: string;
13
14
  selectedImage?: string;
14
15
  disableImage?: string;
@@ -16,7 +17,6 @@ interface ButtonCompProps {
16
17
  onPress: (target: ButtonComp) => void;
17
18
  }
18
19
  export declare class ButtonComp extends NoRenderComponentX<ButtonCompProps> {
19
- set enabled(val: any);
20
20
  }
21
21
  export declare class ProgressBarComp extends ComponentX<{}, ProgressBar> {
22
22
  mode: LoadingBarMode;
@@ -26,7 +26,7 @@ export declare class ProgressBarComp extends ComponentX<{}, ProgressBar> {
26
26
  get progress(): number;
27
27
  set progress(val: number);
28
28
  }
29
- interface LabelCompProps {
29
+ interface LabelCompProps extends BaseComponentProps<LabelComp> {
30
30
  font?: string;
31
31
  string?: string;
32
32
  size?: number;
@@ -47,16 +47,14 @@ export declare class ScrollView extends NoRenderComponentX<ScrollViewProps> {
47
47
  }
48
48
  export declare class BlockInputEventsComp extends NoRenderComponentX {
49
49
  }
50
- interface ProgressTimerProps {
50
+ interface ProgressTimerProps extends BaseComponentProps<ProgressTimerComp> {
51
51
  spriteFrame: string;
52
52
  fillType?: number;
53
53
  fillRange?: number;
54
54
  fillCenter?: Point;
55
55
  isReverse?: boolean;
56
56
  }
57
- export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
58
- $ref?: ProgressTimerComp;
59
- }, ProgressTimer> {
57
+ export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps, ProgressTimer> {
60
58
  getFillRange(): number;
61
59
  setFillStart(val: number): void;
62
60
  setFillRange(val: number): void;
@@ -67,19 +65,23 @@ interface LabelOutlineCompProps {
67
65
  }
68
66
  export declare class LabelOutlineComp extends NoRenderComponentX<LabelOutlineCompProps> {
69
67
  }
70
- interface LabelShadowCompProps {
68
+ interface LabelShadowCompProps extends BaseComponentProps<LabelShadowComp> {
71
69
  color: Color4B;
72
70
  blur: number;
73
71
  offset?: Point;
74
72
  }
75
73
  export declare class LabelShadowComp extends NoRenderComponentX<LabelShadowCompProps> {
76
74
  }
77
- export declare class InputComp extends ComponentX<{}, Input> {
78
- bg: string;
79
- fill: FillInput;
80
- font: string;
81
- string: string;
82
- size: number;
75
+ interface InputCompProps extends BaseComponentProps<InputComp> {
76
+ placeHolder?: string;
77
+ font?: string;
78
+ size?: Integer;
79
+ maxLength?: Integer;
80
+ isPassword?: boolean;
81
+ bg?: string;
82
+ }
83
+ export declare class InputComp extends ComponentX<InputCompProps, Input> {
84
+ get string(): string;
83
85
  }
84
86
  export declare class ListComp extends ComponentX<{}, List> {
85
87
  }
@@ -1 +1 @@
1
- {"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"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"}
@@ -7,12 +7,6 @@ export const FillType = {
7
7
  RADIAL: 2,
8
8
  };
9
9
  export class ButtonComp extends NoRenderComponentX {
10
- // setOnPress(cb: (target: ButtonComp) => void) {
11
- // this.onPress = cb
12
- // }
13
- set enabled(val) {
14
- this.node.instance.interactive = val;
15
- }
16
10
  }
17
11
  export class ProgressBarComp extends ComponentX {
18
12
  constructor() {
@@ -84,9 +78,8 @@ export class LabelOutlineComp extends NoRenderComponentX {
84
78
  export class LabelShadowComp extends NoRenderComponentX {
85
79
  }
86
80
  export class InputComp extends ComponentX {
87
- constructor() {
88
- super(...arguments);
89
- this.size = 64;
81
+ get string() {
82
+ return this.node.instance.value;
90
83
  }
91
84
  }
92
85
  export class ListComp extends ComponentX {
@@ -1 +1 @@
1
- {"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAK7D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAcnC,qBAAa,SAAU,YAAW,MAAM;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC,SAAS,CAAC;CAmGjD"}
1
+ {"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAK7D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAenC,qBAAa,SAAU,YAAW,MAAM;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC,SAAS,CAAC;CAqGjD"}
@@ -1,10 +1,10 @@
1
- import { Button, CheckBox, List, RadioGroup, ScrollBox } from '@pixi/ui';
1
+ import { Button, CheckBox, Input, List, RadioGroup, ScrollBox } from '@pixi/ui';
2
2
  import { EventTypes } from 'entityx-ts';
3
3
  import { callFunc, easeBackIn, scaleTo, sequence } from 'pixi-action-ease';
4
4
  import { Text } from 'pixi.js';
5
- import { NodeComp } from '..';
5
+ import { Color4B, NodeComp } from '..';
6
6
  import { LoadingBarMode, ProgressTimer } from '../core/LoadingBar';
7
- import { ButtonComp, CheckBoxComp, LabelComp, LabelOutlineComp, LabelShadowComp, ListComp, ProgressTimerComp, RadioGroupComp, ScrollView, } from './GUIComponent';
7
+ import { ButtonComp, CheckBoxComp, InputComp, LabelComp, LabelOutlineComp, LabelShadowComp, ListComp, ProgressTimerComp, RadioGroupComp, ScrollView, } from './GUIComponent';
8
8
  export class GUISystem {
9
9
  configure(event_manager) {
10
10
  event_manager.subscribe(EventTypes.ComponentAdded, ButtonComp, ({ entity, component }) => {
@@ -16,6 +16,8 @@ export class GUISystem {
16
16
  component.node = nodeComp;
17
17
  // component.node = entity.assign(new NodeComp(node, entity))
18
18
  button.onPress.connect(() => {
19
+ if (!component.enabled)
20
+ return;
19
21
  // console.log('onPress.connect')
20
22
  const scale = scaleTo(0.5, 1.2);
21
23
  const scaleDown = scaleTo(0.5, 1);
@@ -35,11 +37,12 @@ export class GUISystem {
35
37
  // })
36
38
  event_manager.subscribe(EventTypes.ComponentAdded, ProgressTimerComp, ({ entity, component }) => {
37
39
  // console.log(component, '.progress')
38
- const { spriteFrame, fillCenter } = component.props;
40
+ const { spriteFrame, fillCenter, fillRange = 0 } = component.props;
39
41
  const node = new ProgressTimer(LoadingBarMode.BAR, spriteFrame);
40
42
  if (fillCenter) {
41
43
  node.fillCenter = fillCenter;
42
44
  }
45
+ node.progress = fillRange * 100;
43
46
  component.node = entity.assign(new NodeComp(node, entity));
44
47
  });
45
48
  event_manager.subscribe(EventTypes.ComponentAdded, ScrollView, ({ entity, component }) => {
@@ -65,11 +68,11 @@ export class GUISystem {
65
68
  const view = new CheckBox({ style });
66
69
  component.node = entity.assign(new NodeComp(view, entity));
67
70
  });
68
- // event_manager.subscribe(EventTypes.ComponentAdded, InputComp, ({ entity, component }) => {
69
- // const { bg, size = 48, fill } = component.props
70
- // const view = new Input({ bg, textStyle: { fontSize: size, fill } })
71
- // component.node = entity.assign(new NodeComp(view, entity))
72
- // })
71
+ event_manager.subscribe(EventTypes.ComponentAdded, InputComp, ({ entity, component }) => {
72
+ const { bg, size = 48 } = component.props;
73
+ const view = new Input({ bg, textStyle: { fontSize: size, fill: { color: Color4B(255, 255, 255, 255) } } });
74
+ component.node = entity.assign(new NodeComp(view, entity));
75
+ });
73
76
  event_manager.subscribe(EventTypes.ComponentAdded, LabelComp, ({ entity, component }) => {
74
77
  // console.log('ComponentAddedEvent LabelComp', component)
75
78
  const node = new Text();
@@ -90,7 +93,7 @@ export class GUISystem {
90
93
  }
91
94
  });
92
95
  event_manager.subscribe(EventTypes.ComponentAdded, LabelShadowComp, ({ entity, component }) => {
93
- const { color, blur, offset } = component.props;
96
+ const { color, blur } = component.props;
94
97
  const node = entity.getComponent(NodeComp);
95
98
  if (node.instance instanceof Text) {
96
99
  node.instance.style.dropShadow = { color, blur, alpha: 1, angle: 0, distance: 0 };
@@ -2,28 +2,10 @@ import { Vec2 } from '..';
2
2
  export declare class Touch {
3
3
  private event;
4
4
  constructor(event: any);
5
- getLocation(): import("pixi.js").Point;
5
+ getLocation(): ReturnType<typeof Vec2>;
6
6
  getLocationX(): number;
7
7
  getLocationY(): number;
8
- getDelta(): {
9
- x: number;
10
- y: number;
11
- equals(other: /*elided*/ any): boolean;
12
- add(value: import("pixi.js").Point | Vec2): /*elided*/ any;
13
- addSelf(value: import("pixi.js").Point | Vec2): /*elided*/ any;
14
- sub(value: import("pixi.js").Point | Vec2): /*elided*/ any;
15
- mul(multiply: number): /*elided*/ any;
16
- mulSelf(multiply: number): /*elided*/ any;
17
- mag(): number;
18
- normalizeSelf(): /*elided*/ any;
19
- normalize(): /*elided*/ any;
20
- cross(other: Vec2): number;
21
- signAngle(other: Vec2): number;
22
- lengthSqr(): number;
23
- dot(other: Vec2): number;
24
- angle(other: Vec2): number;
25
- distance(other: /*elided*/ any): number;
26
- };
8
+ getDelta(): ReturnType<typeof Vec2>;
27
9
  getDeltaX(): number;
28
10
  getDeltaY(): number;
29
11
  getLocationInView(view: any): any;
@@ -1 +1 @@
1
- {"version":3,"file":"Touch.d.ts","sourceRoot":"","sources":["../../src/norender/Touch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAEzB,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAuB;gBACxB,KAAK,KAAA;IAIjB,WAAW;IAGX,YAAY;IAGZ,YAAY;IAGZ,QAAQ;;;;;;;;;;;;;;;;;;;IAGR,SAAS;IAGT,SAAS;IAGT,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAI3B,iBAAiB,CAAC,IAAI,EAAE,GAAG;CAI5B"}
1
+ {"version":3,"file":"Touch.d.ts","sourceRoot":"","sources":["../../src/norender/Touch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAEzB,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAuB;gBACxB,KAAK,KAAA;IAIjB,WAAW,IAAI,UAAU,CAAC,OAAO,IAAI,CAAC;IAGtC,YAAY;IAGZ,YAAY;IAGZ,QAAQ,IAAI,UAAU,CAAC,OAAO,IAAI,CAAC;IAGnC,SAAS;IAGT,SAAS;IAGT,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAI3B,iBAAiB,CAAC,IAAI,EAAE,GAAG;CAI5B"}
@@ -4,7 +4,7 @@ export class Touch {
4
4
  this.event = event;
5
5
  }
6
6
  getLocation() {
7
- return this.event.global;
7
+ return Vec2(this.event.global);
8
8
  }
9
9
  getLocationX() {
10
10
  return this.event.globalX;
@@ -1,19 +1,17 @@
1
1
  import { Graphics, Sprite } from 'pixi.js';
2
- import { Color4B, Vec2 } from '..';
2
+ import { BaseComponentProps, Color4B, Vec2 } from '..';
3
3
  import { ComponentX } from '../components/BaseComponent';
4
4
  import { LoadingBarMode } from '../core/LoadingBar';
5
5
  import { SpriteTypes } from './RenderSystem';
6
6
  export declare class NodeRender extends ComponentX {
7
7
  nodeName?: string;
8
8
  }
9
- interface SpriteRenderProps {
9
+ interface SpriteRenderProps extends BaseComponentProps<SpriteRender> {
10
10
  spriteFrame: string;
11
11
  type?: SpriteTypes;
12
12
  fillType?: LoadingBarMode;
13
13
  }
14
- export declare class SpriteRender extends ComponentX<SpriteRenderProps & {
15
- $ref?: SpriteRender;
16
- }, Sprite> {
14
+ export declare class SpriteRender extends ComponentX<SpriteRenderProps, Sprite> {
17
15
  get spriteFrame(): string;
18
16
  set spriteFrame(frame: string);
19
17
  }
@@ -21,14 +19,12 @@ declare enum PointType {
21
19
  Circle = 0,
22
20
  Rect = 1
23
21
  }
24
- interface GraphicsRenderProps {
22
+ interface GraphicsRenderProps extends BaseComponentProps<GraphicsRender> {
25
23
  lineWidth?: number;
26
24
  strokeColor?: Color4B;
27
25
  fillColor?: Color4B;
28
26
  }
29
- export declare class GraphicsRender extends ComponentX<GraphicsRenderProps & {
30
- $ref?: GraphicsRender;
31
- }, Graphics> {
27
+ export declare class GraphicsRender extends ComponentX<GraphicsRenderProps, Graphics> {
32
28
  drawPoint(position: Vec2, pointSize: Float, color: Color4B, pointType?: PointType): void;
33
29
  drawLine(origin: Vec2, destination: Vec2, color: Color4B, thickness: Float): void;
34
30
  drawRect(origin: Vec2, destination: Vec2, color: Color4B): void;
@@ -46,7 +42,7 @@ export declare class GraphicsRender extends ComponentX<GraphicsRenderProps & {
46
42
  drawTriangle(p1: Vec2, p2: Vec2, p3: Vec2, color: Color4B): void;
47
43
  clear(): void;
48
44
  }
49
- interface MaskRenderProps {
45
+ interface MaskRenderProps extends BaseComponentProps<MaskRender> {
50
46
  type?: number;
51
47
  segments?: number;
52
48
  inverted?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import TaggedText from 'pixi-tagged-text-plus';
2
+ import { BaseComponentProps } from '..';
2
3
  import { ComponentX } from '../components/BaseComponent';
3
- interface RichTextCompProps {
4
+ interface RichTextCompProps extends BaseComponentProps<RichTextComp> {
4
5
  font?: string;
5
6
  string?: string;
6
7
  size?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"RichTextComp.d.ts","sourceRoot":"","sources":["../../src/richtext/RichTextComp.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC;IAEzE,IAAI,MAAM,IAKM,MAAM,CAHrB;IAGD,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAWrB;IACD,IAAI,IAAI,IAGO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;IACD,IAAI,IAAI,IAGO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;CACF"}
1
+ {"version":3,"file":"RichTextComp.d.ts","sourceRoot":"","sources":["../../src/richtext/RichTextComp.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAQxD,UAAU,iBAAkB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAClE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC;IACzE,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAWrB;IACD,IAAI,IAAI,IAGO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;IACD,IAAI,IAAI,IAGO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;CACF"}
@@ -1,5 +1,5 @@
1
1
  import { ComponentX } from '../components/BaseComponent';
2
- import { generateStringFromStyledElements, generateStylesFromStyledElements, parseFontString, transformToStyledElements } from './html-text-parser';
2
+ import { generateStringFromStyledElements, generateStylesFromStyledElements, parseFontString, transformToStyledElements, } from './html-text-parser';
3
3
  export class RichTextComp extends ComponentX {
4
4
  get string() {
5
5
  return this.props.string;
@@ -1,17 +1,19 @@
1
- import { ComponentX } from "../components/BaseComponent";
1
+ import { BaseComponentProps } from '..';
2
+ import { ComponentX } from '../components/BaseComponent';
3
+ import { Spine } from './lib';
2
4
  interface SpineData {
3
5
  atlas: string;
4
6
  skeleton: string;
5
7
  texture?: string;
6
8
  }
7
- interface SpineSkeletonProps {
9
+ interface SpineSkeletonProps extends BaseComponentProps<SpineSkeleton> {
8
10
  data: SpineData;
9
11
  skin?: string;
10
12
  animation?: string;
11
13
  timeScale?: number;
12
14
  loop?: boolean;
13
15
  }
14
- export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps> {
16
+ export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps, Spine> {
15
17
  }
16
18
  export {};
17
19
  //# sourceMappingURL=SpineComponent.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SpineComponent.d.ts","sourceRoot":"","sources":["../../src/spine/SpineComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,CAAC;CAEhE"}
1
+ {"version":3,"file":"SpineComponent.d.ts","sourceRoot":"","sources":["../../src/spine/SpineComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7B,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAmB,SAAQ,kBAAkB,CAAC,aAAa,CAAC;IACpE,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,EAAE,KAAK,CAAC;CAAG"}
@@ -1,3 +1,3 @@
1
- import { ComponentX } from "../components/BaseComponent";
1
+ import { ComponentX } from '../components/BaseComponent';
2
2
  export class SpineSkeleton extends ComponentX {
3
3
  }
@@ -27,7 +27,7 @@
27
27
  * SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
28
  *****************************************************************************/
29
29
  import { AnimationState, Bone, Color, MeshAttachment, RegionAttachment, Skeleton, SkeletonBounds, SkeletonData, Slot, TrackEntry } from '@esotericsoftware/spine-core';
30
- import { Bounds, Container, ContainerOptions, DestroyOptions, PointData, Texture, ViewContainer } from 'pixi.js';
30
+ import { Bounds, Container, ContainerChild, ContainerOptions, DestroyOptions, PointData, Texture, ViewContainer } from 'pixi.js';
31
31
  import { ISpineDebugRenderer } from './SpineDebugRenderer.js';
32
32
  /**
33
33
  * Options to create a {@link Spine} using {@link Spine.from}.
@@ -193,7 +193,7 @@ export declare class Spine extends ViewContainer {
193
193
  * @param slotRef - The slot id or slot to get the attachment from
194
194
  * @returns - The container attached to the slot
195
195
  */
196
- getSlotObject(slot: number | string | Slot): Container<import("pixi.js").ContainerChild>;
196
+ getSlotObject(slot: number | string | Slot): Container<ContainerChild>;
197
197
  protected updateBounds(): void;
198
198
  /** @internal */
199
199
  addBounds(bounds: Bounds): void;
@@ -1 +1 @@
1
- {"version":3,"file":"Spine.d.ts","sourceRoot":"","sources":["../../../src/spine/lib/Spine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Spine.d.ts","sourceRoot":"","sources":["../../../src/spine/lib/Spine.ts"],"names":[],"mappings":"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"}