@galacean/engine-ui 2.0.0-alpha.13 → 2.0.0-alpha.15

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/module.js CHANGED
@@ -1,90 +1,4 @@
1
- import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, TransformModifyFlags, Transform, deepClone, Vector2, Rect, MathUtil, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Entity, Script, Camera, 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, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Loader, Shader, ShaderPass, PipelineStage, Font } from '@galacean/engine';
2
-
3
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
4
- try {
5
- var info = gen[key](arg);
6
- var value = info.value;
7
- } catch (error) {
8
- reject(error);
9
- return;
10
- }
11
- if (info.done) resolve(value);
12
- else Promise.resolve(value).then(_next, _throw);
13
- }
14
- function _async_to_generator(fn) {
15
- return function() {
16
- var self = this, args = arguments;
17
-
18
- return new Promise(function(resolve, reject) {
19
- var gen = fn.apply(self, args);
20
-
21
- function _next(value) {
22
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
23
- }
24
-
25
- function _throw(err) {
26
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
27
- }
28
-
29
- _next(undefined);
30
- });
31
- };
32
- }
33
-
34
- /******************************************************************************
35
- Copyright (c) Microsoft Corporation.
36
-
37
- Permission to use, copy, modify, and/or distribute this software for any
38
- purpose with or without fee is hereby granted.
39
-
40
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
41
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
42
- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
43
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
44
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
45
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
46
- PERFORMANCE OF THIS SOFTWARE.
47
- ***************************************************************************** */
48
-
49
- function __decorate(decorators, target, key, desc) {
50
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
51
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
52
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
53
- return c > 3 && r && Object.defineProperty(target, key, r), r;
54
- }
55
-
56
- function __generator(thisArg, body) {
57
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
58
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
59
- function verb(n) { return function (v) { return step([n, v]); }; }
60
- function step(op) {
61
- if (f) throw new TypeError("Generator is already executing.");
62
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
63
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
64
- if (y = 0, t) op = [op[0] & 2, t.value];
65
- switch (op[0]) {
66
- case 0: case 1: t = op; break;
67
- case 4: _.label++; return { value: op[1], done: false };
68
- case 5: _.label++; y = op[1]; op = [0]; continue;
69
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
70
- default:
71
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
72
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
73
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
74
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
75
- if (t[2]) _.ops.pop();
76
- _.trys.pop(); continue;
77
- }
78
- op = body.call(thisArg, _);
79
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
80
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
81
- }
82
- }
83
-
84
- typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
85
- var e = new Error(message);
86
- return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
87
- };
1
+ import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, TransformModifyFlags, Transform, deepClone, Vector2, Rect, MathUtil, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, CloneUtils, Script, CameraModifyFlags, Logger, Signal, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Entity, Loader, Shader, ShaderPass, PipelineStage } from '@galacean/engine';
88
2
 
89
3
  function _defineProperties(target, props) {
90
4
  for (var i = 0; i < props.length; i++) {
@@ -130,6 +44,33 @@ function _instanceof(left, right) {
130
44
  } else return left instanceof right;
131
45
  }
132
46
 
47
+ /******************************************************************************
48
+ Copyright (c) Microsoft Corporation.
49
+
50
+ Permission to use, copy, modify, and/or distribute this software for any
51
+ purpose with or without fee is hereby granted.
52
+
53
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
54
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
55
+ AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
56
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
57
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
58
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
59
+ PERFORMANCE OF THIS SOFTWARE.
60
+ ***************************************************************************** */
61
+
62
+ function __decorate(decorators, target, key, desc) {
63
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
64
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
65
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
66
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
67
+ }
68
+
69
+ typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
70
+ var e = new Error(message);
71
+ return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
72
+ };
73
+
133
74
  var UIGroup = /*#__PURE__*/ function(Component) {
134
75
  _inherits(UIGroup, Component);
135
76
  function UIGroup(entity) {
@@ -1275,10 +1216,7 @@ UIRenderer = __decorate([
1275
1216
  dstTransition.disabled = srcTransition.disabled;
1276
1217
  var transitionTarget = srcTransition.target;
1277
1218
  if (transitionTarget) {
1278
- var paths = UIInteractive._targetTempPath;
1279
- // @ts-ignore
1280
- var success = Entity._getEntityHierarchyPath(srcRoot, transitionTarget.entity, paths);
1281
- dstTransition.target = success ? Entity._getEntityByHierarchyPath(targetRoot, paths).getComponent(transitionTarget.constructor) : transitionTarget;
1219
+ dstTransition.target = CloneUtils.remapComponent(srcRoot, targetRoot, transitionTarget);
1282
1220
  }
1283
1221
  target.addTransition(dstTransition);
1284
1222
  }
@@ -1393,7 +1331,6 @@ UIRenderer = __decorate([
1393
1331
  ]);
1394
1332
  return UIInteractive;
1395
1333
  }(Script);
1396
- UIInteractive._targetTempPath = new Array();
1397
1334
  __decorate([
1398
1335
  ignoreClone
1399
1336
  ], UIInteractive.prototype, "_rootCanvas", void 0);
@@ -1613,11 +1550,7 @@ var UICanvas = /*#__PURE__*/ function(Component) {
1613
1550
  target.renderMode = this._renderMode;
1614
1551
  var camera = this._camera;
1615
1552
  if (camera) {
1616
- var paths = UICanvas._targetTempPath;
1617
- // @ts-ignore
1618
- var success = Entity._getEntityHierarchyPath(srcRoot, camera.entity, paths);
1619
- // @ts-ignore
1620
- target.camera = success ? Entity._getEntityByHierarchyPath(targetRoot, paths).getComponent(Camera) : camera;
1553
+ target.camera = CloneUtils.remapComponent(srcRoot, targetRoot, camera);
1621
1554
  }
1622
1555
  };
1623
1556
  _proto._getRenderers = function _getRenderers() {
@@ -2015,7 +1948,6 @@ var UICanvas = /*#__PURE__*/ function(Component) {
2015
1948
  return UICanvas;
2016
1949
  }(Component);
2017
1950
  /** @internal */ UICanvas._hierarchyCounter = 1;
2018
- UICanvas._targetTempPath = [];
2019
1951
  UICanvas._tempGroupAbleList = [];
2020
1952
  UICanvas._tempVec3 = new Vector3();
2021
1953
  UICanvas._tempMat = new Matrix();
@@ -2121,45 +2053,41 @@ var Button = /*#__PURE__*/ function(UIInteractive) {
2121
2053
  _inherits(Button, UIInteractive);
2122
2054
  function Button() {
2123
2055
  var _this;
2124
- _this = UIInteractive.apply(this, arguments) || this, _this._listeners = new SafeLoopArray();
2056
+ _this = UIInteractive.apply(this, arguments) || this, /** Signal emitted when the button is clicked. */ _this.onClick = new Signal();
2125
2057
  return _this;
2126
2058
  }
2127
2059
  var _proto = Button.prototype;
2060
+ _proto.onPointerClick = function onPointerClick(event) {
2061
+ if (!this._getGlobalInteractive()) return;
2062
+ this.onClick.invoke(event);
2063
+ };
2064
+ _proto.onDestroy = function onDestroy() {
2065
+ UIInteractive.prototype.onDestroy.call(this);
2066
+ this.onClick.removeAll();
2067
+ };
2068
+ // @ts-ignore
2069
+ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
2070
+ UIInteractive.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
2071
+ // @ts-ignore
2072
+ this.onClick._cloneTo(target.onClick, srcRoot, targetRoot);
2073
+ };
2128
2074
  /**
2129
2075
  * Add a listening function for click.
2130
- * @param listener - The listening function
2076
+ * @deprecated Use `onClick.on(listener, context)` instead.
2131
2077
  */ _proto.addClicked = function addClicked(listener) {
2132
- this._listeners.push({
2133
- fn: listener
2134
- });
2078
+ this.onClick.on(listener);
2135
2079
  };
2136
2080
  /**
2137
2081
  * Remove a listening function of click.
2138
- * @param listener - The listening function
2082
+ * @deprecated Use `onClick.off(listener, context)` instead.
2139
2083
  */ _proto.removeClicked = function removeClicked(listener) {
2140
- this._listeners.findAndRemove(function(value) {
2141
- return value.fn === listener ? value.destroyed = true : false;
2142
- });
2143
- };
2144
- _proto.onPointerClick = function onPointerClick(event) {
2145
- if (!this._getGlobalInteractive()) return;
2146
- var listeners = this._listeners.getLoopArray();
2147
- for(var i = 0, n = listeners.length; i < n; i++){
2148
- var listener = listeners[i];
2149
- !listener.destroyed && listener.fn(event);
2150
- }
2151
- };
2152
- _proto.onDestroy = function onDestroy() {
2153
- UIInteractive.prototype.onDestroy.call(this);
2154
- this._listeners.findAndRemove(function(value) {
2155
- return value.destroyed = true;
2156
- });
2084
+ this.onClick.off(listener);
2157
2085
  };
2158
2086
  return Button;
2159
2087
  }(UIInteractive);
2160
2088
  __decorate([
2161
2089
  ignoreClone
2162
- ], Button.prototype, "_listeners", void 0);
2090
+ ], Button.prototype, "onClick", void 0);
2163
2091
 
2164
2092
  /**
2165
2093
  * UI element that renders an image.
@@ -3648,20 +3576,6 @@ ApplyMixins(Engine, [
3648
3576
  ApplyMixins(Entity, [
3649
3577
  EntityExtension
3650
3578
  ]);
3651
- ReflectionParser.registerCustomParseComponent("Text", /*#__PURE__*/ _async_to_generator(function(instance, item) {
3652
- var props;
3653
- return __generator(this, function(_state) {
3654
- props = item.props;
3655
- if (!props.font) {
3656
- // @ts-ignore
3657
- instance.font = Font.createFromOS(instance.engine, props.fontFamily || "Arial");
3658
- }
3659
- return [
3660
- 2,
3661
- instance
3662
- ];
3663
- });
3664
- }));
3665
3579
  /**
3666
3580
  * Register GUI components for the editor.
3667
3581
  */ function registerGUI() {