bard-legends-framework 0.7.36 → 0.7.38
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.
- package/dist/pixi/components/scroll-area.ui.js +5 -6
- package/dist/pixi/components/scroll-area.ui.js.map +1 -1
- package/dist/pixi/display-object/objects/text.d.ts +3 -0
- package/dist/pixi/display-object/objects/text.js +16 -2
- package/dist/pixi/display-object/objects/text.js.map +1 -1
- package/package.json +1 -1
- package/package.json.bak +1 -1
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ScrollAreaUI = void 0;
|
|
4
4
|
const helpers_lib_1 = require("helpers-lib");
|
|
5
5
|
const game_entities_1 = require("../../game-entities");
|
|
6
|
-
const utilities_1 = require("../../utilities");
|
|
7
6
|
const container_1 = require("../display-object/container");
|
|
8
7
|
const sprite_1 = require("../display-object/objects/sprite");
|
|
9
8
|
const game_1 = require("../game");
|
|
@@ -11,6 +10,7 @@ const mouse_wheel_listener_ui_1 = require("./mouse-wheel-listener.ui");
|
|
|
11
10
|
const scroll_mask_ui_1 = require("./scroll-mask.ui");
|
|
12
11
|
const DEFAULT_PADDING = 15;
|
|
13
12
|
const SCROLL_SPEED = 0.65;
|
|
13
|
+
const SCROLL_SPEED_DECAY_RATE = 0.01;
|
|
14
14
|
class SmoothScroller extends game_entities_1.Destroyable {
|
|
15
15
|
constructor(content, areaHeight, padding, smallContentAlign) {
|
|
16
16
|
super();
|
|
@@ -29,15 +29,14 @@ class SmoothScroller extends game_entities_1.Destroyable {
|
|
|
29
29
|
this.updateCycleSubscription.unsubscribe();
|
|
30
30
|
this.updateCycleSubscription = undefined;
|
|
31
31
|
}
|
|
32
|
-
onWheel(
|
|
33
|
-
this.targetY -=
|
|
32
|
+
onWheel(scrollDelta) {
|
|
33
|
+
this.targetY -= scrollDelta * SCROLL_SPEED;
|
|
34
34
|
this.targetY = helpers_lib_1.NumberHelper.clamp(this.targetY, this.areaHeight - this.padding - this.content.size.y, this.padding);
|
|
35
35
|
}
|
|
36
36
|
update(delta) {
|
|
37
37
|
if (this.content.size.y > this.scrollHeight) {
|
|
38
38
|
let distance = this.targetY - this.content.y;
|
|
39
|
-
|
|
40
|
-
this.content.y = newPositionY;
|
|
39
|
+
this.content.y = this.content.y + distance * SCROLL_SPEED_DECAY_RATE * delta;
|
|
41
40
|
}
|
|
42
41
|
else {
|
|
43
42
|
if (this.smallContentAlign === 'center') {
|
|
@@ -69,7 +68,7 @@ class ScrollAreaUI extends container_1.Container {
|
|
|
69
68
|
let content = new container_1.Container().displayParent(wrapper).attach(this);
|
|
70
69
|
let scroller = new SmoothScroller(content, size.y, options.padding, options.smallContentAlign).attach(this);
|
|
71
70
|
let scrollArea = new mouse_wheel_listener_ui_1.MouseWheelListenerUI(size).displayParent(wrapper).attach(this);
|
|
72
|
-
scrollArea.onWheel.subscribe(
|
|
71
|
+
scrollArea.onWheel.subscribe(scrollDelta => scroller.onWheel(scrollDelta)).attach(this);
|
|
73
72
|
this.addChildTo = content;
|
|
74
73
|
}
|
|
75
74
|
afterDestroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-area.ui.js","sourceRoot":"","sources":["../../../src/pixi/components/scroll-area.ui.ts"],"names":[],"mappings":";;;AACA,6CAAmD;AAEnD,uDAA+D;AAC/D
|
|
1
|
+
{"version":3,"file":"scroll-area.ui.js","sourceRoot":"","sources":["../../../src/pixi/components/scroll-area.ui.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export type PartialTextOptions = Partial<Omit<TextOptions, 'dropShadow'>> & {
|
|
|
22
22
|
export declare class Text extends Container {
|
|
23
23
|
private pixiText;
|
|
24
24
|
private style;
|
|
25
|
+
private text;
|
|
25
26
|
constructor(text: string, partialOptions?: PartialTextOptions);
|
|
26
27
|
private setStyle;
|
|
27
28
|
protected destroySelf(): void;
|
|
@@ -29,4 +30,6 @@ export declare class Text extends Container {
|
|
|
29
30
|
get anchor(): Vector;
|
|
30
31
|
set anchor(value: Vector);
|
|
31
32
|
setText(text: string): this;
|
|
33
|
+
setColor(color: RGBColor): this;
|
|
34
|
+
private regeneratePixiText;
|
|
32
35
|
}
|
|
@@ -90,11 +90,25 @@ class Text extends container_1.Container {
|
|
|
90
90
|
this.pixiText.anchor.set(value.x, value.y);
|
|
91
91
|
}
|
|
92
92
|
setText(text) {
|
|
93
|
+
if (this.text !== text) {
|
|
94
|
+
this.text = text;
|
|
95
|
+
this.regeneratePixiText();
|
|
96
|
+
}
|
|
97
|
+
return this;
|
|
98
|
+
}
|
|
99
|
+
setColor(color) {
|
|
100
|
+
let colorHex = helpers_lib_1.ColorHelper.rgbToHex(color);
|
|
101
|
+
if (this.style.fill !== colorHex) {
|
|
102
|
+
this.style.fill = colorHex;
|
|
103
|
+
this.regeneratePixiText();
|
|
104
|
+
}
|
|
105
|
+
return this;
|
|
106
|
+
}
|
|
107
|
+
regeneratePixiText() {
|
|
93
108
|
this.pixiText?.destroy();
|
|
94
|
-
this.pixiText = new PIXI.Text(text, new PIXI.TextStyle(this.style));
|
|
109
|
+
this.pixiText = new PIXI.Text(this.text, new PIXI.TextStyle(this.style));
|
|
95
110
|
this.pixiText.scale.set(FONT_SIZE_MULTIPLIER_INVERSE, FONT_SIZE_MULTIPLIER_INVERSE);
|
|
96
111
|
this.pixiContainer.addChild(this.pixiText);
|
|
97
|
-
return this;
|
|
98
112
|
}
|
|
99
113
|
}
|
|
100
114
|
exports.Text = Text;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../src/pixi/display-object/objects/text.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAoE;AACpE,8CAAgC;AAEhC,4CAAyC;AAwBzC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,4BAA4B,GAAG,CAAC,GAAG,oBAAoB,CAAC;AAE9D,MAAa,IAAK,SAAQ,qBAAS;
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../src/pixi/display-object/objects/text.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED