@gedit/editor-2d 0.1.114 → 0.2.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 (134) hide show
  1. package/lib/browser/editor2d-context-key-service.js +24 -35
  2. package/lib/browser/editor2d-context-key-service.js.map +1 -1
  3. package/lib/browser/editor2d-contribution.js +89 -139
  4. package/lib/browser/editor2d-contribution.js.map +1 -1
  5. package/lib/browser/editor2d-frontend-module.js +20 -20
  6. package/lib/browser/editor2d-frontend-module.js.map +1 -1
  7. package/lib/browser/editor2d-label-provider.d.ts +0 -1
  8. package/lib/browser/editor2d-label-provider.d.ts.map +1 -1
  9. package/lib/browser/editor2d-label-provider.js +37 -58
  10. package/lib/browser/editor2d-label-provider.js.map +1 -1
  11. package/lib/browser/editor2d-model-provider.js +61 -127
  12. package/lib/browser/editor2d-model-provider.js.map +1 -1
  13. package/lib/browser/editor2d-ref-provider-contribution.d.ts +1 -1
  14. package/lib/browser/editor2d-ref-provider-contribution.d.ts.map +1 -1
  15. package/lib/browser/editor2d-ref-provider-contribution.js +46 -112
  16. package/lib/browser/editor2d-ref-provider-contribution.js.map +1 -1
  17. package/lib/browser/editor2d-service.js +66 -85
  18. package/lib/browser/editor2d-service.js.map +1 -1
  19. package/lib/browser/model/editor2d-document.d.ts +46 -20
  20. package/lib/browser/model/editor2d-document.d.ts.map +1 -1
  21. package/lib/browser/model/editor2d-document.js +602 -549
  22. package/lib/browser/model/editor2d-document.js.map +1 -1
  23. package/lib/browser/model/editor2d-iterator.js +27 -67
  24. package/lib/browser/model/editor2d-iterator.js.map +1 -1
  25. package/lib/browser/model/editor2d-model-container.js +10 -21
  26. package/lib/browser/model/editor2d-model-container.js.map +1 -1
  27. package/lib/browser/model/editor2d-model.js +77 -92
  28. package/lib/browser/model/editor2d-model.js.map +1 -1
  29. package/lib/browser/model/editor2d-selection.js +16 -43
  30. package/lib/browser/model/editor2d-selection.js.map +1 -1
  31. package/lib/browser/model/editor2d-widget.js +71 -90
  32. package/lib/browser/model/editor2d-widget.js.map +1 -1
  33. package/lib/browser/model/editor2d.d.ts +8 -4
  34. package/lib/browser/model/editor2d.d.ts.map +1 -1
  35. package/lib/browser/model/editor2d.js +61 -128
  36. package/lib/browser/model/editor2d.js.map +1 -1
  37. package/lib/browser/model/utils/anim.utils.d.ts +3 -0
  38. package/lib/browser/model/utils/anim.utils.d.ts.map +1 -1
  39. package/lib/browser/model/utils/anim.utils.js +24 -18
  40. package/lib/browser/model/utils/anim.utils.js.map +1 -1
  41. package/lib/browser/playground/canvas-draw.d.ts +8 -0
  42. package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
  43. package/lib/browser/playground/canvas-draw.js +164 -252
  44. package/lib/browser/playground/canvas-draw.js.map +1 -1
  45. package/lib/browser/playground/canvas-layer.d.ts +10 -2
  46. package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
  47. package/lib/browser/playground/canvas-layer.js +78 -102
  48. package/lib/browser/playground/canvas-layer.js.map +1 -1
  49. package/lib/browser/playground/entities/document-entity.js +8 -28
  50. package/lib/browser/playground/entities/document-entity.js.map +1 -1
  51. package/lib/browser/playground/entities/editor2d-entity.js +14 -37
  52. package/lib/browser/playground/entities/editor2d-entity.js.map +1 -1
  53. package/lib/browser/playground/entities/extend-entity.d.ts +10 -0
  54. package/lib/browser/playground/entities/extend-entity.d.ts.map +1 -0
  55. package/lib/browser/playground/entities/extend-entity.js +34 -0
  56. package/lib/browser/playground/entities/extend-entity.js.map +1 -0
  57. package/lib/browser/playground/entities/index.d.ts +1 -0
  58. package/lib/browser/playground/entities/index.d.ts.map +1 -1
  59. package/lib/browser/playground/entities/index.js +1 -0
  60. package/lib/browser/playground/entities/index.js.map +1 -1
  61. package/lib/browser/playground/extend-edit-layer-point-event.d.ts +30 -0
  62. package/lib/browser/playground/extend-edit-layer-point-event.d.ts.map +1 -0
  63. package/lib/browser/playground/extend-edit-layer-point-event.js +50 -0
  64. package/lib/browser/playground/extend-edit-layer-point-event.js.map +1 -0
  65. package/lib/browser/playground/extend-edit-layer.d.ts +38 -0
  66. package/lib/browser/playground/extend-edit-layer.d.ts.map +1 -0
  67. package/lib/browser/playground/extend-edit-layer.js +335 -0
  68. package/lib/browser/playground/extend-edit-layer.js.map +1 -0
  69. package/lib/browser/playground/index.d.ts +1 -0
  70. package/lib/browser/playground/index.d.ts.map +1 -1
  71. package/lib/browser/playground/index.js +1 -0
  72. package/lib/browser/playground/index.js.map +1 -1
  73. package/lib/browser/playground/path-edit-layer-move-point.d.ts +15 -0
  74. package/lib/browser/playground/path-edit-layer-move-point.d.ts.map +1 -0
  75. package/lib/browser/playground/path-edit-layer-move-point.js +47 -0
  76. package/lib/browser/playground/path-edit-layer-move-point.js.map +1 -0
  77. package/lib/browser/playground/path-edit-layer-svg-path.d.ts +11 -0
  78. package/lib/browser/playground/path-edit-layer-svg-path.d.ts.map +1 -0
  79. package/lib/browser/playground/path-edit-layer-svg-path.js +21 -0
  80. package/lib/browser/playground/path-edit-layer-svg-path.js.map +1 -0
  81. package/lib/browser/playground/path-edit-layer.d.ts +36 -0
  82. package/lib/browser/playground/path-edit-layer.d.ts.map +1 -0
  83. package/lib/browser/playground/path-edit-layer.js +257 -0
  84. package/lib/browser/playground/path-edit-layer.js.map +1 -0
  85. package/lib/browser/playground/playground-context.d.ts +3 -1
  86. package/lib/browser/playground/playground-context.d.ts.map +1 -1
  87. package/lib/browser/playground/playground-context.js +49 -47
  88. package/lib/browser/playground/playground-context.js.map +1 -1
  89. package/lib/browser/playground/playground-contribution.d.ts +2 -0
  90. package/lib/browser/playground/playground-contribution.d.ts.map +1 -1
  91. package/lib/browser/playground/playground-contribution.js +100 -67
  92. package/lib/browser/playground/playground-contribution.js.map +1 -1
  93. package/lib/browser/playground/selection-entity-manager.js +74 -132
  94. package/lib/browser/playground/selection-entity-manager.js.map +1 -1
  95. package/lib/browser/playground/selector-extend-icons.js +15 -16
  96. package/lib/browser/playground/selector-extend-icons.js.map +1 -1
  97. package/lib/browser/playground/selector-extend-renderer.d.ts +3 -2
  98. package/lib/browser/playground/selector-extend-renderer.d.ts.map +1 -1
  99. package/lib/browser/playground/selector-extend-renderer.js +67 -52
  100. package/lib/browser/playground/selector-extend-renderer.js.map +1 -1
  101. package/lib/browser/utils/snapshot.d.ts.map +1 -1
  102. package/lib/browser/utils/snapshot.js +81 -172
  103. package/lib/browser/utils/snapshot.js.map +1 -1
  104. package/package.json +9 -7
  105. package/src/browser/editor2d-label-provider.ts +1 -15
  106. package/src/browser/editor2d-ref-provider-contribution.ts +8 -8
  107. package/src/browser/model/editor2d-document.ts +284 -51
  108. package/src/browser/model/editor2d.ts +21 -5
  109. package/src/browser/model/utils/anim.utils.ts +9 -2
  110. package/src/browser/playground/canvas-draw.ts +31 -17
  111. package/src/browser/playground/canvas-layer.ts +25 -3
  112. package/src/browser/playground/entities/extend-entity.ts +37 -0
  113. package/src/browser/playground/entities/index.ts +1 -0
  114. package/src/browser/playground/extend-edit-layer-point-event.tsx +71 -0
  115. package/src/browser/playground/extend-edit-layer.tsx +442 -0
  116. package/src/browser/playground/index.ts +1 -0
  117. package/src/browser/playground/path-edit-layer-move-point.tsx +71 -0
  118. package/src/browser/playground/path-edit-layer-svg-path.tsx +50 -0
  119. package/src/browser/playground/path-edit-layer.tsx +330 -0
  120. package/src/browser/playground/playground-context.ts +2 -0
  121. package/src/browser/playground/playground-contribution.ts +37 -3
  122. package/src/browser/playground/selector-extend-renderer.tsx +43 -10
  123. package/src/browser/style/canvas-layer.css +16 -0
  124. package/src/browser/style/extend-edit-layer.less +127 -0
  125. package/src/browser/style/index.less +2 -1
  126. package/src/browser/style/path-edit-layer.less +72 -0
  127. package/src/browser/svg/pen+.svg +24 -0
  128. package/src/browser/utils/snapshot.ts +1 -0
  129. package/lib/browser/playground/canvas-draw-layer.d.ts +0 -22
  130. package/lib/browser/playground/canvas-draw-layer.d.ts.map +0 -1
  131. package/lib/browser/playground/canvas-draw-layer.js +0 -126
  132. package/lib/browser/playground/canvas-draw-layer.js.map +0 -1
  133. package/src/browser/playground/canvas-draw-layer.tsx +0 -88
  134. package/src/browser/style/canvas-draw-layer.less +0 -24
@@ -1,114 +1,61 @@
1
1
  "use strict";
2
- var __assign = (this && this.__assign) || function () {
3
- __assign = Object.assign || function(t) {
4
- for (var s, i = 1, n = arguments.length; i < n; i++) {
5
- s = arguments[i];
6
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
- t[p] = s[p];
2
+ var __rest = (this && this.__rest) || function (s, e) {
3
+ var t = {};
4
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
+ t[p] = s[p];
6
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
+ t[p[i]] = s[p[i]];
8
10
  }
9
- return t;
10
- };
11
- return __assign.apply(this, arguments);
12
- };
13
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
- return new (P || (P = Promise))(function (resolve, reject) {
16
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
17
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
18
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
19
- step((generator = generator.apply(thisArg, _arguments || [])).next());
20
- });
21
- };
22
- var __generator = (this && this.__generator) || function (thisArg, body) {
23
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
24
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
25
- function verb(n) { return function (v) { return step([n, v]); }; }
26
- function step(op) {
27
- if (f) throw new TypeError("Generator is already executing.");
28
- while (_) try {
29
- 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;
30
- if (y = 0, t) op = [op[0] & 2, t.value];
31
- switch (op[0]) {
32
- case 0: case 1: t = op; break;
33
- case 4: _.label++; return { value: op[1], done: false };
34
- case 5: _.label++; y = op[1]; op = [0]; continue;
35
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
36
- default:
37
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
38
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
39
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
40
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
41
- if (t[2]) _.ops.pop();
42
- _.trys.pop(); continue;
43
- }
44
- op = body.call(thisArg, _);
45
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
46
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
- }
48
- };
49
- var __read = (this && this.__read) || function (o, n) {
50
- var m = typeof Symbol === "function" && o[Symbol.iterator];
51
- if (!m) return o;
52
- var i = m.call(o), r, ar = [], e;
53
- try {
54
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
55
- }
56
- catch (error) { e = { error: error }; }
57
- finally {
58
- try {
59
- if (r && !r.done && (m = i["return"])) m.call(i);
60
- }
61
- finally { if (e) throw e.error; }
62
- }
63
- return ar;
64
- };
65
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
66
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
67
- if (ar || !(i in from)) {
68
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
69
- ar[i] = from[i];
70
- }
71
- }
72
- return to.concat(ar || Array.prototype.slice.call(from));
11
+ return t;
73
12
  };
74
13
  Object.defineProperty(exports, "__esModule", { value: true });
75
14
  exports.checkDuplicateNodes = exports.getEditor2dModelOpts = exports.Editor2dModelOptions = exports.Editor2dNode = exports.Editor2dContent = exports.Editor2dDocumentContextMenuPath = void 0;
76
- var utils_1 = require("@gedit/utils");
77
- var browser_1 = require("@gedit/resource/lib/browser");
78
- var render_engine_1 = require("@gedit/render-engine");
79
- var nanoid_1 = require("nanoid");
80
- var stringify = require('json-stringify-pretty-compact');
15
+ const utils_1 = require("@gedit/utils");
16
+ const browser_1 = require("@gedit/resource/lib/browser");
17
+ const render_engine_1 = require("@gedit/render-engine");
18
+ const nanoid_1 = require("nanoid");
19
+ const stringify = require('json-stringify-pretty-compact');
81
20
  // 文档内容菜单
82
21
  exports.Editor2dDocumentContextMenuPath = ['editor2d-docuemnt-menu'];
83
22
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
84
- function omitNode(node, omitKeys, assign) {
85
- if (omitKeys === void 0) { omitKeys = []; }
23
+ function omitNode(node, omitKeys = [], assign) {
86
24
  if (!node)
87
25
  return node;
88
- var result = (0, utils_1.omit)(node, __spreadArray([
26
+ let result = (0, utils_1.omit)(node, [
89
27
  'parent',
90
28
  'previousSibling',
91
29
  'nextSibling',
92
30
  'version',
93
31
  'selected',
94
- 'focus'
95
- ], __read(omitKeys), false));
32
+ 'focus',
33
+ ...omitKeys
34
+ ]);
96
35
  if (assign)
97
36
  result = assign(result);
98
37
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
99
38
  if (result.children)
100
- result.children = result.children.map(function (n) { return omitNode(n, omitKeys, assign); });
39
+ result.children = result.children.map((n) => omitNode(n, omitKeys, assign));
101
40
  return result;
102
41
  }
103
42
  var Editor2dContent;
104
43
  (function (Editor2dContent) {
105
44
  function parseToJSON(contentData) {
45
+ const content = omitNode(contentData.content, [], node => {
46
+ node.selected = false;
47
+ // console.log('>>>>>>>>>>>>>>cache', node.cache);
48
+ // 不保存动画数据,,如果有 cache 直接用 cache 的,cache 为 timeline 专属
49
+ const { cache } = node, n = __rest(node, ["cache"]);
50
+ if (cache) {
51
+ return Object.assign(Object.assign({}, n), cache);
52
+ }
53
+ return n;
54
+ });
55
+ // console.log(content);
106
56
  return {
107
57
  version: contentData.version,
108
- content: omitNode(contentData.content, [], function (node) {
109
- node.selected = false;
110
- return node;
111
- }),
58
+ content,
112
59
  snaplines: contentData.snaplines,
113
60
  };
114
61
  }
@@ -124,7 +71,7 @@ var Editor2dNode;
124
71
  Editor2dNode.GLOBAL_ADD_EVENT = 'global_add_event'; // 全局添加标记事件
125
72
  function createNodeId(checks) {
126
73
  // 用短id生成减少大小
127
- var newId = (0, nanoid_1.nanoid)(10);
74
+ const newId = (0, nanoid_1.nanoid)(10);
128
75
  // id 冲突,重新生成
129
76
  if (checks && checks.includes(newId)) {
130
77
  return createNodeId(checks);
@@ -141,7 +88,7 @@ var Editor2dNode;
141
88
  }
142
89
  Editor2dNode.toContainerNode = toContainerNode;
143
90
  function getNodePath(node) {
144
- var path = [];
91
+ const path = [];
145
92
  while (node) {
146
93
  path.unshift(node.id);
147
94
  node = node.parent;
@@ -150,7 +97,7 @@ var Editor2dNode;
150
97
  }
151
98
  Editor2dNode.getNodePath = getNodePath;
152
99
  function getNodeNamePath(node) {
153
- var path = [];
100
+ const path = [];
154
101
  while (node && !Editor2dNode.isRootNode(node)) {
155
102
  path.unshift(node.name || '');
156
103
  node = node.parent;
@@ -159,7 +106,7 @@ var Editor2dNode;
159
106
  }
160
107
  Editor2dNode.getNodeNamePath = getNodeNamePath;
161
108
  function getDepth(node) {
162
- var depth = 0;
109
+ let depth = 0;
163
110
  while (node && !Editor2dNode.isRootNode(node)) {
164
111
  depth++;
165
112
  node = node.parent;
@@ -190,8 +137,8 @@ var Editor2dNode;
190
137
  function getURIByRootNode(workspaceURI, node) {
191
138
  if (!isRootNode(node))
192
139
  throw new Error('getURIByRootNode need a root node');
193
- var path = '';
194
- var displayType = node.displayType;
140
+ let path = '';
141
+ const displayType = node.displayType;
195
142
  switch (displayType) {
196
143
  case render_engine_1.GameObjectBaseType.COMPONENT:
197
144
  path = 'gedit/component/' + node.name;
@@ -205,28 +152,26 @@ var Editor2dNode;
205
152
  return new utils_1.URI(workspaceURI.path.join(path).toString());
206
153
  }
207
154
  Editor2dNode.getURIByRootNode = getURIByRootNode;
208
- function clone(targetNode, omitKeys, checks) {
209
- if (omitKeys === void 0) { omitKeys = []; }
210
- return (0, utils_1.deepClone)(omitNode(targetNode, __spreadArray(['id', 'selected'], __read(omitKeys), false), function (node) { return Object.assign(node, {
155
+ function clone(targetNode, omitKeys = [], checks) {
156
+ return (0, utils_1.deepClone)(omitNode(targetNode, ['id', 'selected', ...omitKeys], node => Object.assign(node, {
211
157
  id: createNodeId(checks),
212
158
  selected: false
213
- }); }));
159
+ })));
214
160
  }
215
161
  Editor2dNode.clone = clone;
216
162
  /**
217
163
  * 生成普通节点
218
164
  */
219
- function createNode(members, displayType, id, checks) {
220
- if (members === void 0) { members = {}; }
165
+ function createNode(members = {}, displayType, id, checks) {
221
166
  id = id || createNodeId(checks);
222
- return __assign(__assign({}, members), { displayType: displayType, parent: undefined, selected: false, locked: false, canvasHide: false, version: 0, id: id });
167
+ return Object.assign(Object.assign({}, members), { displayType, parent: undefined, selected: false, locked: false, canvasHide: false, version: 0, id });
223
168
  }
224
169
  Editor2dNode.createNode = createNode;
225
170
  /**
226
171
  * 生成根节点
227
172
  */
228
173
  function createRootNode(uri) {
229
- var displayType;
174
+ let displayType;
230
175
  switch (uri.path.ext) {
231
176
  case '.comp':
232
177
  displayType = render_engine_1.GameObjectBaseType.COMPONENT;
@@ -238,7 +183,7 @@ var Editor2dNode;
238
183
  throw new Error('Cannot create root node by uri: ' + uri);
239
184
  }
240
185
  return {
241
- displayType: displayType,
186
+ displayType,
242
187
  id: Editor2dNode.ROOT_NODE_ID,
243
188
  parent: undefined,
244
189
  name: uri.displayName,
@@ -253,10 +198,10 @@ var Editor2dNode;
253
198
  }
254
199
  Editor2dNode.createRootNode = createRootNode;
255
200
  function registerTreeNodesDrop(node, onDrop, onDrag) {
256
- var handle = {
257
- handleEvent: function (event) {
258
- var source = event.source;
259
- var checkSource = source && source.length > 0 && Editor2dNode.is(source[0]);
201
+ const handle = {
202
+ handleEvent(event) {
203
+ const source = event.source;
204
+ const checkSource = source && source.length > 0 && Editor2dNode.is(source[0]);
260
205
  if (checkSource) {
261
206
  event.dropAction = event.proposedAction;
262
207
  }
@@ -275,7 +220,7 @@ var Editor2dNode;
275
220
  node.addEventListener('p-dragleave', handle);
276
221
  node.addEventListener('p-drop', handle);
277
222
  return {
278
- dispose: function () {
223
+ dispose: () => {
279
224
  node.addEventListener('p-dragenter', handle);
280
225
  node.addEventListener('p-dragover', handle);
281
226
  node.addEventListener('p-dragleave', handle);
@@ -286,37 +231,25 @@ var Editor2dNode;
286
231
  Editor2dNode.registerTreeNodesDrop = registerTreeNodesDrop;
287
232
  })(Editor2dNode = exports.Editor2dNode || (exports.Editor2dNode = {}));
288
233
  exports.Editor2dModelOptions = browser_1.ResourceAutoSaveOptions;
289
- function getEditor2dModelOpts(resource, resourceService, encoding) {
290
- if (encoding === void 0) { encoding = 'utf8'; }
291
- return __awaiter(this, void 0, void 0, function () {
292
- var options, autoSaveService;
293
- return __generator(this, function (_a) {
294
- switch (_a.label) {
295
- case 0:
296
- options = {
297
- encoding: encoding,
298
- resource: resource,
299
- saveAsString: function (e) { return Editor2dContent.parseToString({ version: e.document.saveVersion, content: e.document.root, snaplines: e.document.snaplines }); }
300
- };
301
- return [4 /*yield*/, resourceService.createAutoSaveResource(options)];
302
- case 1:
303
- autoSaveService = _a.sent();
304
- return [2 /*return*/, __assign(__assign({}, options), { autoSaveService: autoSaveService })];
305
- }
306
- });
307
- });
234
+ async function getEditor2dModelOpts(resource, resourceService, encoding = 'utf8') {
235
+ const options = {
236
+ encoding,
237
+ resource,
238
+ saveAsString: e => Editor2dContent.parseToString({ version: e.document.saveVersion, content: e.document.root, snaplines: e.document.snaplines })
239
+ };
240
+ const autoSaveService = await resourceService.createAutoSaveResource(options);
241
+ return Object.assign(Object.assign({}, options), { autoSaveService });
308
242
  }
309
243
  exports.getEditor2dModelOpts = getEditor2dModelOpts;
310
244
  /**
311
245
  * 检测重复节点数据, 可能为误操作造成,避免对编辑态造成影响
312
246
  * @param node
313
247
  */
314
- function checkDuplicateNodes(node, map) {
315
- if (map === void 0) { map = {}; }
248
+ function checkDuplicateNodes(node, map = {}) {
316
249
  if (node.children) {
317
- node.children.slice().forEach(function (c) {
250
+ node.children.slice().forEach((c) => {
318
251
  if (map[c.id]) {
319
- var index = node.children.indexOf(c);
252
+ const index = node.children.indexOf(c);
320
253
  node.children.splice(index, 1);
321
254
  console.log('>>> 清除重复数据: ', c.name);
322
255
  }
@@ -1 +1 @@
1
- {"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,wCAAgE;AAChE,yDAAoH;AAEpH,wDAA0F;AAO1F,mCAAgC;AAGhC,MAAM,SAAS,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAe3D,SAAS;AACI,QAAA,+BAA+B,GAAG,CAAC,wBAAwB,CAAC,CAAC;AAE1E,8DAA8D;AAC9D,SAAS,QAAQ,CAAC,IAA2C,EAAE,WAAqB,EAAE,EAAE,MAA0C;IAChI,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,MAAM,GAAG,IAAA,YAAI,EAAC,IAAI,EAAE;QACtB,QAAQ;QACR,iBAAiB;QACjB,aAAa;QACb,SAAS;QACT,UAAU;QACV,OAAO;QACP,GAAG,QAAQ;KACZ,CAAC,CAAC;IACH,IAAI,MAAM;QAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,8DAA8D;IAC9D,IAAI,MAAM,CAAC,QAAQ;QAAE,MAAM,CAAC,QAAQ,GAAI,MAAgC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACjI,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,IAAiB,eAAe,CAsB/B;AAtBD,WAAiB,eAAe;IAC9B,SAAgB,WAAW,CAAC,WAA4B;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;YACvD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,kDAAkD;YAClD,qDAAqD;YACrD,MAAM,EAAE,KAAK,KAAW,IAAI,EAAV,CAAC,UAAK,IAAI,EAAtB,SAAe,CAAO,CAAC;YAC7B,IAAI,KAAK,EAAE;gBACT,uCAAY,CAAC,GAAK,KAAK,EAAG;aAC3B;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QACH,wBAAwB;QACxB,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,OAAO;YACP,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;IACJ,CAAC;IAjBe,2BAAW,cAiB1B,CAAA;IACD,SAAgB,aAAa,CAAC,WAA4B;QACxD,OAAO,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7C,CAAC;IAFe,6BAAa,gBAE5B,CAAA;AACH,CAAC,EAtBgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAsB/B;AA8BD,IAAiB,YAAY,CAkK5B;AAlKD,WAAiB,YAAY;IACd,yBAAY,GAAG,MAAM,CAAC;IACtB,6BAAgB,GAAG,kBAAkB,CAAC,CAAC,WAAW;IAC/D,SAAgB,YAAY,CAAC,MAAiB;QAC5C,aAAa;QACb,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,EAAE,CAAC,CAAC;QACzB,aAAa;QACb,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;SAC7B;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IARe,yBAAY,eAQ3B,CAAA;IACD,SAAgB,eAAe,CAAC,IAA0C;QACxE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACtB;QACD,OAAO,IAA6B,CAAC;IACvC,CAAC;IANe,4BAAe,kBAM9B,CAAA;IACD,SAAgB,WAAW,CAAC,IAAqD;QAC/E,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,OAAO,IAAI,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,IAAI,GAAG,IAAI,CAAC,MAA+B,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAPe,wBAAW,cAO1B,CAAA;IACD,SAAgB,eAAe,CAAC,IAAqD;QACnF,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAC9B,IAAI,GAAG,IAAI,CAAC,MAA+B,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAPe,4BAAe,kBAO9B,CAAA;IACD,SAAgB,QAAQ,CAAC,IAAqD;QAC5E,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC7C,KAAK,EAAG,CAAC;YACT,IAAI,GAAG,IAAI,CAAC,MAA+B,CAAC;SAC7C;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAPe,qBAAQ,WAOvB,CAAA;IACD,SAAgB,UAAU,CAAC,IAA0C;QACnE,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;YACrB,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QACD,OAAO,IAAoB,CAAC;IAC9B,CAAC;IANe,uBAAU,aAMzB,CAAA;IACD,SAAgB,kBAAkB,CAAC,IAAkB;QACnD,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACnD,CAAC;IAFe,+BAAkB,qBAEjC,CAAA;IACD,SAAgB,EAAE,CAAC,IAAwB;QACzC,OAAO,CAAC,CAAC,IAAI,IAAI,aAAa,IAAI,IAAI,CAAC;IACzC,CAAC;IAFe,eAAE,KAEjB,CAAA;IACD,SAAgB,UAAU,CAAC,IAAwB;QACjD,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,KAAK,aAAA,YAAY,CAAC;IAC9C,CAAC;IAFe,uBAAU,aAEzB,CAAA;IACD,SAAgB,gBAAgB,CAAC,YAAiB,EAAE,IAAwB;QAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC5E,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,MAAM,WAAW,GAAI,IAAqB,CAAC,WAAW,CAAC;QACvD,QAAQ,WAAW,EAAE;YACnB,KAAK,kCAAkB,CAAC,SAAS;gBAC/B,IAAI,GAAG,kBAAkB,GAAI,IAAqB,CAAC,IAAI,CAAC;gBACxD,MAAM;YACR,KAAK,kCAAkB,CAAC,KAAK;gBAC3B,IAAI,GAAG,cAAc,GAAI,IAAqB,CAAC,IAAI,CAAC;gBACpD,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,WAAW,CAAC,CAAC;SACpE;QACD,OAAO,IAAI,WAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAfe,6BAAgB,mBAe/B,CAAA;IACD,SAAgB,KAAK,CAAC,UAAwB,EAAE,WAAqB,EAAE,EAAE,MAAiB;QACxF,OAAO,IAAA,iBAAS,EAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YACjG,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC;YACxB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;IALe,kBAAK,QAKpB,CAAA;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,UAAiC,EAAE,EAAE,WAA2B,EAAE,EAAW,EAAE,MAAiB;QACzH,EAAE,GAAG,EAAE,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;QAChC,OAAO,gCACF,OAAO,KACV,WAAW,EACX,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,CAAC,EACV,EAAE,GACa,CAAC;IACpB,CAAC;IAZe,uBAAU,aAYzB,CAAA;IAED;;OAEG;IACH,SAAgB,cAAc,CAAC,GAAQ;QACrC,IAAI,WAA2B,CAAC;QAChC,QAAQ,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;YACpB,KAAK,OAAO;gBACV,WAAW,GAAG,kCAAkB,CAAC,SAAS,CAAC;gBAC3C,MAAM;YACR,KAAK,QAAQ;gBACX,WAAW,GAAG,kCAAkB,CAAC,KAAK,CAAC;gBACvC,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAC;SAC7D;QACD,OAAO;YACL,WAAW;YACX,EAAE,EAAE,YAAY,CAAC,YAAY;YAC7B,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,CAAC;SACc,CAAC;IAC7B,CAAC;IAzBe,2BAAc,iBAyB7B,CAAA;IAID,SAAgB,qBAAqB,CAAC,IAAiB,EAAE,MAAsB,EAAE,MAAuB;QACtG,MAAM,MAAM,GAAG;YACb,WAAW,CAAC,KAAiB;gBAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAwB,CAAC;gBAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9E,IAAI,WAAW,EAAE;oBACf,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC;iBACzC;gBACD,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,WAAW,EAAE;oBAC1H,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;iBACvB;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,EAAE;oBAC1C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;iBACvB;gBACD,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC,cAAc,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAC5C,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC;IACJ,CAAC;IA9Be,kCAAqB,wBA8BpC,CAAA;AACH,CAAC,EAlKgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAkK5B;AAEY,QAAA,oBAAoB,GAAG,iCAAuB,CAAC;AAWrD,KAAK,UAAU,oBAAoB,CAAC,QAAkB,EAAE,eAAyC,EAAE,WAAmB,MAAM;IACjI,MAAM,OAAO,GAA4B;QACvC,QAAQ;QACR,QAAQ;QACR,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAC,CAAC;KAC/I,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC9E,uCACK,OAAO,KACV,eAAe,IACf;AACJ,CAAC;AAXD,oDAWC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,IAAkB,EAAE,MAAuC,EAAE;IAC/F,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAe,EAAE,EAAE;YAChD,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACrC;iBAAM;gBACL,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACd,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aAC7B;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,kDAcC"}
@@ -6,6 +6,9 @@ interface KeysValue {
6
6
  key: string;
7
7
  name: string;
8
8
  }
9
+ export declare const animArrayKeys: {
10
+ [key: string]: string;
11
+ };
9
12
  export declare const getAnimationKeys: (renderEngineService: RenderEngineService, register: GameObjectIDERegister<GameObjectData>, timelineDisabledKeys: string[]) => KeysValue[];
10
13
  export declare const getChangeAnimationData: (values: KeysValue[], nodeData: Editor2dNode, newData: Editor2dNode) => {
11
14
  [key: string]: any;
@@ -1 +1 @@
1
- {"version":3,"file":"anim.utils.d.ts","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,sBAAsB,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAsCD,eAAO,MAAM,gBAAgB,wBACN,mBAAmB,YAC9B,sBAAsB,cAAc,CAAC,wBACzB,MAAM,EAAE,KAC7B,SAAS,EAaX,CAAC;AAEF,eAAO,MAAM,sBAAsB,WACzB,SAAS,EAAE,YACT,YAAY,WACb,YAAY;;CAWtB,CAAC"}
1
+ {"version":3,"file":"anim.utils.d.ts","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,sBAAsB,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAID,eAAO,MAAM,aAAa,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAIjD,CAAC;AAqCF,eAAO,MAAM,gBAAgB,wBACN,mBAAmB,YAC9B,sBAAsB,cAAc,CAAC,wBACzB,MAAM,EAAE,KAC7B,SAAS,EAaX,CAAC;AAEF,eAAO,MAAM,sBAAsB,WACzB,SAAS,EAAE,YACT,YAAY,WACb,YAAY;;CAWtB,CAAC"}
@@ -1,48 +1,54 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getChangeAnimationData = exports.getAnimationKeys = void 0;
4
- var editor2d_1 = require("../editor2d");
5
- var utils_1 = require("@gedit/utils");
3
+ exports.getChangeAnimationData = exports.getAnimationKeys = exports.animArrayKeys = void 0;
4
+ const editor2d_1 = require("../editor2d");
5
+ const utils_1 = require("@gedit/utils");
6
6
  // 添加进时间轴动画的条件;
7
- var supportKeys = ['integer', 'float', 'color'];
7
+ const supportKeys = ['integer', 'float', 'color'];
8
+ // 三个数组 key 写死
9
+ exports.animArrayKeys = {
10
+ 'style.color': 'FillArray',
11
+ 'style.line': 'LineArray',
12
+ 'style.lineDash': 'LineDashArray',
13
+ };
8
14
  function readAnimationKeys(deco, keyList, currentKey, parentName, parentKey) {
9
- var currentLabel = parentName && deco.label ? "".concat(parentName, ".").concat(deco.label) : deco.label;
15
+ const currentLabel = parentName && deco.label ? `${parentName}.${deco.label}` : deco.label;
10
16
  currentKey =
11
- parentKey && currentKey ? "".concat(parentKey, ".").concat(currentKey) : currentKey;
17
+ parentKey && currentKey ? `${parentKey}.${currentKey}` : currentKey;
12
18
  // 进时间轴条件,必须带 label, ref: { label: 'xxx', type: 'float' };
13
19
  if (deco.properties) {
14
- Object.keys(deco.properties).forEach(function (property) {
20
+ Object.keys(deco.properties).forEach((property) => {
15
21
  readAnimationKeys(deco.properties[property], keyList, property, currentLabel, currentKey);
16
22
  });
17
23
  }
18
24
  else if (currentLabel &&
19
25
  currentKey &&
20
- supportKeys.includes(deco.type) &&
21
- !currentKey.match(/^(origin)/) // 干掉原点
22
- ) {
26
+ (supportKeys.includes(deco.type) &&
27
+ !currentKey.match(/^(origin)/) // 干掉原点
28
+ || exports.animArrayKeys[currentKey])) {
23
29
  keyList.push({
24
30
  key: currentKey,
25
31
  name: currentLabel.toUpperCase(),
26
32
  });
27
33
  }
28
34
  }
29
- var getAnimationKeys = function (renderEngineService, register, timelineDisabledKeys) {
30
- var keyList = [];
35
+ const getAnimationKeys = (renderEngineService, register, timelineDisabledKeys) => {
36
+ let keyList = [];
31
37
  if (register.defaultDataDecoration) {
32
- var deco = typeof register.defaultDataDecoration === 'function'
38
+ const deco = typeof register.defaultDataDecoration === 'function'
33
39
  ? register.defaultDataDecoration(renderEngineService)
34
40
  : register.defaultDataDecoration;
35
41
  readAnimationKeys(deco, keyList);
36
42
  }
37
- keyList = keyList.filter(function (f) { return !timelineDisabledKeys.find(function (c) { return f.key.indexOf(c) >= 0; }); });
43
+ keyList = keyList.filter(f => !timelineDisabledKeys.find(c => f.key.indexOf(c) >= 0));
38
44
  return keyList;
39
45
  };
40
46
  exports.getAnimationKeys = getAnimationKeys;
41
- var getChangeAnimationData = function (values, nodeData, newData) {
42
- var data = editor2d_1.Editor2dNode.clone(nodeData);
47
+ const getChangeAnimationData = (values, nodeData, newData) => {
48
+ const data = editor2d_1.Editor2dNode.clone(nodeData);
43
49
  Object.assign(data, { id: nodeData.id });
44
- values.forEach(function (item) {
45
- var v = (0, utils_1.getByKey)(newData, item.key);
50
+ values.forEach(item => {
51
+ const v = (0, utils_1.getByKey)(newData, item.key);
46
52
  if (typeof v !== 'undefined') {
47
53
  (0, utils_1.setByKey)(data, item.key, v);
48
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"anim.utils.js","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":";;;AAIA,wCAA2C;AAC3C,sCAAkD;AAMlD,eAAe;AACf,IAAM,WAAW,GAAiB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAChE,SAAS,iBAAiB,CACxB,IAAsB,EACtB,OAAwC,EACxC,UAAmB,EACnB,UAAmB,EACnB,SAAkB;IAElB,IAAM,YAAY,GAChB,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAG,UAAU,cAAI,IAAI,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACxE,UAAU;QACR,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,UAAG,SAAS,cAAI,UAAU,CAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IACtE,0DAA0D;IAC1D,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,QAAgB;YACpD,iBAAiB,CACf,IAAI,CAAC,UAAW,CAAC,QAAQ,CAAqB,EAC9C,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,UAAU,CACX,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;SAAM,IACL,YAAY;QACZ,UAAU;QACV,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC/B,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO;MACtC;QACA,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,YAAY,CAAC,WAAW,EAAE;SACjC,CAAC,CAAC;KACJ;AACH,CAAC;AAEM,IAAM,gBAAgB,GAAG,UAC9B,mBAAwC,EACxC,QAA+C,EAC/C,oBAA8B;IAE9B,IAAI,OAAO,GAAoC,EAAE,CAAC;IAClD,IAAI,QAAQ,CAAC,qBAAqB,EAAE;QAClC,IAAM,IAAI,GACR,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU;YAClD,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,mBAAmB,CAAC;YACrD,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QACrC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAClC;IACD,OAAO,GAAG,OAAO,CAAC,MAAM,CACtB,UAAA,CAAC,IAAI,OAAA,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAArB,CAAqB,CAAC,EAAtD,CAAsD,CAC5D,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B;AAEK,IAAM,sBAAsB,GAAG,UACpC,MAAmB,EACnB,QAAsB,EACtB,OAAqB;IAErB,IAAM,IAAI,GAAG,uBAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,OAAO,CAAC,UAAA,IAAI;QACjB,IAAM,CAAC,GAAG,IAAA,gBAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE;YAC5B,IAAA,gBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC"}
1
+ {"version":3,"file":"anim.utils.js","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ export interface CanvasDrawOpts {
13
13
  renderEngine: RenderEngineIDEService;
14
14
  assetsURI: string;
15
15
  getComponentContent: (compId: string, parentNode: Editor2dNode) => Editor2dNode[] | undefined;
16
+ isSnapshot?: boolean;
16
17
  isTemplate?: boolean;
17
18
  }
18
19
  export interface CanvasDrawData {
@@ -50,6 +51,7 @@ export declare class CanvasDraw extends DisposableImpl {
50
51
  protected onDrawEmitter: Emitter<GameConfig.SceneSizeConfig>;
51
52
  protected onLoadingEmitter: Emitter<CanvasDrawLoadingState>;
52
53
  protected onGameObjectChangeEmitter: Emitter<GameObjectChangeEvent>;
54
+ protected onRenderWidgetCreateEmitter: Emitter<GameWidgetIDE<GameSceneIDE<any>>>;
53
55
  protected data?: CanvasDrawData;
54
56
  private booted;
55
57
  private libLoaded;
@@ -59,6 +61,11 @@ export declare class CanvasDraw extends DisposableImpl {
59
61
  readonly gameObjectCache: Map<string, GameObject>;
60
62
  readonly nodeCache: Map<string, Editor2dNode>;
61
63
  protected nodeVersionCache: Map<string, string>;
64
+ protected maskCache: Map<string, {
65
+ mask?: string;
66
+ isMask?: boolean;
67
+ ignoreMask?: boolean;
68
+ }>;
62
69
  protected lastRenderKeys: string[];
63
70
  protected renderWidgetDispose: Disposable | undefined;
64
71
  protected pixelArt: boolean;
@@ -67,6 +74,7 @@ export declare class CanvasDraw extends DisposableImpl {
67
74
  readonly onDraw: import("@gedit/utils").Event<GameConfig.SceneSizeConfig>;
68
75
  readonly onLoading: import("@gedit/utils").Event<CanvasDrawLoadingState>;
69
76
  readonly onGameObjectChange: import("@gedit/utils").Event<GameObjectChangeEvent>;
77
+ readonly onRenderWidgetCreate: import("@gedit/utils").Event<GameWidgetIDE<GameSceneIDE<any>>>;
70
78
  loading: boolean;
71
79
  constructor(opts: CanvasDrawOpts);
72
80
  protected startLoadLibs(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"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"}