@galacean/engine-ui 1.5.7 → 1.5.9
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/browser.js +34 -3
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +34 -3
- package/dist/main.js.map +1 -1
- package/dist/module.js +35 -4
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/component/UITransform.d.ts +2 -1
- package/types/component/interactive/UIInteractive.d.ts +4 -2
package/dist/module.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, deepClone, Vector2,
|
|
1
|
+
import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, Transform, deepClone, Vector2, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Entity, Script, MathUtil, CameraModifyFlags, Logger, SafeLoopArray, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, ReflectionParser, Shader, ShaderPass, PipelineStage, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Loader, Font } from '@galacean/engine';
|
|
2
2
|
|
|
3
3
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
4
4
|
try {
|
|
@@ -523,6 +523,13 @@ var Utils = /*#__PURE__*/ function() {
|
|
|
523
523
|
return _this;
|
|
524
524
|
}
|
|
525
525
|
var _proto = UITransform.prototype;
|
|
526
|
+
// @ts-ignore
|
|
527
|
+
_proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
|
|
528
|
+
// @ts-ignore
|
|
529
|
+
Transform.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
|
|
530
|
+
target.size.copyFrom(this._size);
|
|
531
|
+
target.pivot.copyFrom(this._pivot);
|
|
532
|
+
};
|
|
526
533
|
_proto._onSizeChange = function _onSizeChange() {
|
|
527
534
|
// @ts-ignore
|
|
528
535
|
this._entity._updateFlagManager.dispatch(512);
|
|
@@ -832,7 +839,7 @@ UIRenderer = __decorate([
|
|
|
832
839
|
_inherits(UIInteractive, Script);
|
|
833
840
|
function UIInteractive(entity) {
|
|
834
841
|
var _this;
|
|
835
|
-
_this = Script.call(this, entity) || this, /** @internal */ _this._indexInRootCanvas = -1, /** @internal */ _this._isRootCanvasDirty = false, /** @internal */ _this._rootCanvasListeningEntities = [], /** @internal */ _this._indexInGroup = -1, /** @internal */ _this._isGroupDirty = false, /** @internal */ _this._groupListeningEntities = [], /** @internal */ _this._globalInteractive = false, /** @internal */ _this._globalInteractiveDirty = false, _this.
|
|
842
|
+
_this = Script.call(this, entity) || this, /** @internal */ _this._indexInRootCanvas = -1, /** @internal */ _this._isRootCanvasDirty = false, /** @internal */ _this._rootCanvasListeningEntities = [], /** @internal */ _this._indexInGroup = -1, /** @internal */ _this._isGroupDirty = false, /** @internal */ _this._groupListeningEntities = [], /** @internal */ _this._globalInteractive = false, /** @internal */ _this._globalInteractiveDirty = false, _this._transitions = [], _this._interactive = true, _this._state = 0, /** @todo Multi-touch points are not considered yet. */ _this._isPointerInside = false, _this._isPointerDragging = false;
|
|
836
843
|
_this._groupListener = _this._groupListener.bind(_this);
|
|
837
844
|
_this._rootCanvasListener = _this._rootCanvasListener.bind(_this);
|
|
838
845
|
return _this;
|
|
@@ -905,6 +912,26 @@ UIRenderer = __decorate([
|
|
|
905
912
|
transitions[i].destroy();
|
|
906
913
|
}
|
|
907
914
|
};
|
|
915
|
+
// @ts-ignore
|
|
916
|
+
_proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
|
|
917
|
+
var transitions = this._transitions;
|
|
918
|
+
for(var i = 0, n = transitions.length; i < n; i++){
|
|
919
|
+
var srcTransition = transitions[i];
|
|
920
|
+
var dstTransition = new transitions[i].constructor();
|
|
921
|
+
dstTransition.normal = srcTransition.normal;
|
|
922
|
+
dstTransition.pressed = srcTransition.pressed;
|
|
923
|
+
dstTransition.hover = srcTransition.hover;
|
|
924
|
+
dstTransition.disabled = srcTransition.disabled;
|
|
925
|
+
var transitionTarget = srcTransition.target;
|
|
926
|
+
if (transitionTarget) {
|
|
927
|
+
var paths = UIInteractive._targetTempPath;
|
|
928
|
+
// @ts-ignore
|
|
929
|
+
var success = Entity._getEntityHierarchyPath(srcRoot, transitionTarget.entity, paths);
|
|
930
|
+
dstTransition.target = success ? Entity._getEntityByHierarchyPath(targetRoot, paths).getComponent(transitionTarget.constructor) : transitionTarget;
|
|
931
|
+
}
|
|
932
|
+
target.addTransition(dstTransition);
|
|
933
|
+
}
|
|
934
|
+
};
|
|
908
935
|
/**
|
|
909
936
|
* @internal
|
|
910
937
|
*/ _proto._getRootCanvas = function _getRootCanvas() {
|
|
@@ -1015,6 +1042,7 @@ UIRenderer = __decorate([
|
|
|
1015
1042
|
]);
|
|
1016
1043
|
return UIInteractive;
|
|
1017
1044
|
}(Script);
|
|
1045
|
+
UIInteractive._targetTempPath = new Array();
|
|
1018
1046
|
__decorate([
|
|
1019
1047
|
ignoreClone
|
|
1020
1048
|
], UIInteractive.prototype, "_rootCanvas", void 0);
|
|
@@ -1045,6 +1073,9 @@ __decorate([
|
|
|
1045
1073
|
__decorate([
|
|
1046
1074
|
ignoreClone
|
|
1047
1075
|
], UIInteractive.prototype, "_globalInteractiveDirty", void 0);
|
|
1076
|
+
__decorate([
|
|
1077
|
+
ignoreClone
|
|
1078
|
+
], UIInteractive.prototype, "_transitions", void 0);
|
|
1048
1079
|
__decorate([
|
|
1049
1080
|
ignoreClone
|
|
1050
1081
|
], UIInteractive.prototype, "_groupListener", null);
|
|
@@ -2894,9 +2925,9 @@ var GUIComponent = /*#__PURE__*/Object.freeze({
|
|
|
2894
2925
|
Transition: Transition
|
|
2895
2926
|
});
|
|
2896
2927
|
|
|
2897
|
-
var uiDefaultFs = "#
|
|
2928
|
+
var uiDefaultFs = "#include <common>\nuniform sampler2D renderer_UITexture;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n vec4 baseColor = texture2DSRGB(renderer_UITexture, v_uv);\n vec4 finalColor = baseColor * v_color;\n #ifdef ENGINE_SHOULD_SRGB_CORRECT\n finalColor = outputSRGBCorrection(finalColor);\n #endif\n gl_FragColor = finalColor;\n}"; // eslint-disable-line
|
|
2898
2929
|
|
|
2899
|
-
var uiDefaultVs = "
|
|
2930
|
+
var uiDefaultVs = "uniform mat4 renderer_MVPMat;\n\nattribute vec3 POSITION;\nattribute vec2 TEXCOORD_0;\nattribute vec4 COLOR_0;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n gl_Position = renderer_MVPMat * vec4(POSITION, 1.0);\n\n v_uv = TEXCOORD_0;\n v_color = COLOR_0;\n}\n"; // eslint-disable-line
|
|
2900
2931
|
|
|
2901
2932
|
/**
|
|
2902
2933
|
* @internal
|