@gedit/editor-2d 0.3.10 → 0.3.11
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/lib/browser/model/editor2d-document.d.ts +3 -1
- package/lib/browser/model/editor2d-document.d.ts.map +1 -1
- package/lib/browser/model/editor2d-document.js +18 -12
- package/lib/browser/model/editor2d-document.js.map +1 -1
- package/lib/browser/model/utils/anim.utils.d.ts +1 -0
- package/lib/browser/model/utils/anim.utils.d.ts.map +1 -1
- package/lib/browser/model/utils/anim.utils.js +22 -0
- package/lib/browser/model/utils/anim.utils.js.map +1 -1
- package/lib/browser/playground/anim-path-edit-layer.d.ts.map +1 -1
- package/lib/browser/playground/anim-path-edit-layer.js +5 -3
- package/lib/browser/playground/anim-path-edit-layer.js.map +1 -1
- package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
- package/lib/browser/playground/canvas-draw.js +6 -3
- package/lib/browser/playground/canvas-draw.js.map +1 -1
- package/lib/browser/playground/canvas-layer.d.ts +1 -2
- package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
- package/lib/browser/playground/canvas-layer.js +53 -44
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/lib/browser/playground/extend-edit/gradient-conic-node.js +4 -4
- package/lib/browser/playground/extend-edit/gradient-conic-node.js.map +1 -1
- package/lib/browser/playground/extend-edit/gradient-node.d.ts.map +1 -1
- package/lib/browser/playground/extend-edit/gradient-node.js +3 -3
- package/lib/browser/playground/extend-edit/gradient-node.js.map +1 -1
- package/lib/browser/playground/path-edit/utils.d.ts +2 -2
- package/lib/browser/playground/path-edit/utils.d.ts.map +1 -1
- package/lib/browser/playground/path-edit/utils.js +55 -45
- package/lib/browser/playground/path-edit/utils.js.map +1 -1
- package/lib/browser/playground/path-edit-layer.d.ts +11 -1
- package/lib/browser/playground/path-edit-layer.d.ts.map +1 -1
- package/lib/browser/playground/path-edit-layer.js +242 -75
- package/lib/browser/playground/path-edit-layer.js.map +1 -1
- package/lib/browser/playground/selection-entity-manager.d.ts.map +1 -1
- package/lib/browser/playground/selection-entity-manager.js +60 -10
- package/lib/browser/playground/selection-entity-manager.js.map +1 -1
- package/lib/browser/utils/bounds.js +4 -4
- package/lib/browser/utils/snapshot.d.ts.map +1 -1
- package/lib/browser/utils/snapshot.js +2 -1
- package/lib/browser/utils/snapshot.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/model/editor2d-document.ts +22 -12
- package/src/browser/model/utils/anim.utils.ts +24 -0
- package/src/browser/playground/anim-path-edit-layer.tsx +8 -4
- package/src/browser/playground/canvas-draw.ts +6 -3
- package/src/browser/playground/canvas-layer.ts +25 -14
- package/src/browser/playground/extend-edit/gradient-conic-node.tsx +4 -4
- package/src/browser/playground/extend-edit/gradient-node.tsx +3 -2
- package/src/browser/playground/path-edit/utils.tsx +56 -54
- package/src/browser/playground/path-edit-layer.tsx +310 -74
- package/src/browser/playground/selection-entity-manager.tsx +127 -30
- package/src/browser/utils/bounds.ts +4 -4
- package/src/browser/utils/snapshot.ts +1 -0
- package/LICENSE +0 -21
|
@@ -3,15 +3,17 @@ import { Editor2dNode } from '../model';
|
|
|
3
3
|
import { Editor2dEntity } from './entities/editor2d-entity';
|
|
4
4
|
import { DefaultSelectorEntityRenderer, EditorState, EditorStateConfigEntity, PlaygroundConfigEntity, SelectorConfigEntity, } from '@gedit/playground';
|
|
5
5
|
import { Rectangle } from '@gedit/math';
|
|
6
|
+
import { GameObjectBaseType } from '@gedit/render-engine';
|
|
6
7
|
import { SelectorExtendRender } from './selector-extend-renderer';
|
|
7
8
|
import { followKeyType } from '@gedit/render-engine-pixi';
|
|
9
|
+
import { toFixedValue, } from '@gedit/canvas-draw';
|
|
8
10
|
const numberToFixed4 = (data) => {
|
|
9
11
|
const d = {};
|
|
10
12
|
Object.keys(data).forEach(key => {
|
|
11
13
|
const value = data[key];
|
|
12
14
|
// 旋转不能四舍五入,不然属性面板旋转角度误差很大
|
|
13
15
|
if (typeof value === 'number' && key !== 'rotation') {
|
|
14
|
-
d[key] =
|
|
16
|
+
d[key] = toFixedValue(value, 2);
|
|
15
17
|
}
|
|
16
18
|
else if (typeof value === 'object') {
|
|
17
19
|
d[key] = numberToFixed4(value);
|
|
@@ -37,7 +39,8 @@ export class SelectionEntityManager {
|
|
|
37
39
|
const selectionConfigEntity = entityManager.getEntity(SelectorConfigEntity);
|
|
38
40
|
selectionConfigEntity === null || selectionConfigEntity === void 0 ? void 0 : selectionConfigEntity.customSelectorEntityRenderer(props => {
|
|
39
41
|
var _a;
|
|
40
|
-
const showSceneRangeRuler = ((_a = editorStateConfigEntity === null || editorStateConfigEntity === void 0 ? void 0 : editorStateConfigEntity.getCurrentState) === null || _a === void 0 ? void 0 : _a.call(editorStateConfigEntity)) ===
|
|
42
|
+
const showSceneRangeRuler = ((_a = editorStateConfigEntity === null || editorStateConfigEntity === void 0 ? void 0 : editorStateConfigEntity.getCurrentState) === null || _a === void 0 ? void 0 : _a.call(editorStateConfigEntity)) ===
|
|
43
|
+
EditorState.SHOW_SCENE_RANGE_RULER;
|
|
41
44
|
const newProps = Object.assign(Object.assign({}, props), {
|
|
42
45
|
// editorStateConfigEntity, // 当前菜单状态, "SHOW_SCENE_RANGE_RULER" 显示场景范围标尺
|
|
43
46
|
elemState: showSceneRangeRuler ? 'line' : 'all' });
|
|
@@ -95,8 +98,10 @@ export class SelectionEntityManager {
|
|
|
95
98
|
const entity = this.entityManager.createEntity(Editor2dEntity, { id: nodePath });
|
|
96
99
|
entity.selectableInit = selectable;
|
|
97
100
|
entity.adsorbableInit = adsorbable;
|
|
98
|
-
entity.mouseSelect =
|
|
99
|
-
|
|
101
|
+
entity.mouseSelect =
|
|
102
|
+
selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
|
|
103
|
+
entity.adsorbable =
|
|
104
|
+
adsorbable && (deco.adsorbable === undefined ? true : deco.adsorbable);
|
|
100
105
|
entity.gameObject = gameObject;
|
|
101
106
|
entity.document = this.getDocument();
|
|
102
107
|
entity.nodeId = node.id;
|
|
@@ -108,11 +113,14 @@ export class SelectionEntityManager {
|
|
|
108
113
|
height: ((_b = gameObject.data.scene) === null || _b === void 0 ? void 0 : _b.height) || 400,
|
|
109
114
|
};
|
|
110
115
|
}
|
|
116
|
+
if (gameObject.type === GameObjectBaseType.PATH) {
|
|
117
|
+
entity.transform.isPath = true;
|
|
118
|
+
}
|
|
111
119
|
this.setTransformMask(entity, nodePath, node);
|
|
112
120
|
// 切换选择框的类型,如圆形、矩形, 默认矩形
|
|
113
121
|
if (deco.selectDisplayType) {
|
|
114
122
|
entity.selectState.update({
|
|
115
|
-
displayType: deco.selectDisplayType
|
|
123
|
+
displayType: deco.selectDisplayType,
|
|
116
124
|
});
|
|
117
125
|
}
|
|
118
126
|
// 实体选中状态改变
|
|
@@ -170,6 +178,35 @@ export class SelectionEntityManager {
|
|
|
170
178
|
}
|
|
171
179
|
}
|
|
172
180
|
}
|
|
181
|
+
// 减掉根据 bounds 计算的 origin
|
|
182
|
+
if (gameObject.type === GameObjectBaseType.PATH) {
|
|
183
|
+
const { bounds: pathBounds } = gameObject.getBounds();
|
|
184
|
+
const { path } = gameObject.data;
|
|
185
|
+
const { origin = { x: 0, y: 0 }, } = node;
|
|
186
|
+
const { originChangeBeforeSize } = path;
|
|
187
|
+
const offset = {
|
|
188
|
+
x: 0,
|
|
189
|
+
y: 0,
|
|
190
|
+
};
|
|
191
|
+
if (originChangeBeforeSize) {
|
|
192
|
+
if (originChangeBeforeSize.width !== pathBounds.width) {
|
|
193
|
+
offset.x +=
|
|
194
|
+
((pathBounds.width - originChangeBeforeSize.width) * origin.x) /
|
|
195
|
+
pathBounds.width;
|
|
196
|
+
}
|
|
197
|
+
if (originChangeBeforeSize.height !== pathBounds.height) {
|
|
198
|
+
offset.y +=
|
|
199
|
+
((pathBounds.height - originChangeBeforeSize.height) * origin.y) /
|
|
200
|
+
pathBounds.height;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
newTransform.origin.x = toFixedValue(newTransform.origin.x +
|
|
204
|
+
(pathBounds ? pathBounds.minX / pathBounds.width : 0) +
|
|
205
|
+
offset.x, 2);
|
|
206
|
+
newTransform.origin.y = toFixedValue(newTransform.origin.y +
|
|
207
|
+
(pathBounds ? pathBounds.minY / pathBounds.height : 0) +
|
|
208
|
+
offset.y, 2);
|
|
209
|
+
}
|
|
173
210
|
let oldTransform = {};
|
|
174
211
|
Object.keys(entity.transform.data).forEach((key) => {
|
|
175
212
|
oldTransform[key] = node[key];
|
|
@@ -225,6 +262,9 @@ export class SelectionEntityManager {
|
|
|
225
262
|
height: ((_b = gameObject.data.scene) === null || _b === void 0 ? void 0 : _b.height) || 400,
|
|
226
263
|
};
|
|
227
264
|
}
|
|
265
|
+
if (gameObject.type === GameObjectBaseType.PATH) {
|
|
266
|
+
entity.transform.isPath = true;
|
|
267
|
+
}
|
|
228
268
|
entity.update(register.getSelectionData(gameObject, scale));
|
|
229
269
|
entity.ignoreTransformChanged = false;
|
|
230
270
|
const sizeVisible = !this.isHidden(entity.node); // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
|
|
@@ -232,9 +272,16 @@ export class SelectionEntityManager {
|
|
|
232
272
|
// 图层节点无法被选中
|
|
233
273
|
entity.selectable = entity.selectableInit && sizeVisible;
|
|
234
274
|
// 锁定状态的节点无法通过鼠标点击
|
|
235
|
-
entity.mouseSelect =
|
|
275
|
+
entity.mouseSelect =
|
|
276
|
+
(deco.mouseSelect === undefined ? true : deco.mouseSelect) &&
|
|
277
|
+
!opacityZero &&
|
|
278
|
+
!this.isLocked(node);
|
|
236
279
|
// 是否支持吸附
|
|
237
|
-
entity.adsorbable =
|
|
280
|
+
entity.adsorbable =
|
|
281
|
+
entity.adsorbableInit &&
|
|
282
|
+
sizeVisible &&
|
|
283
|
+
!opacityZero &&
|
|
284
|
+
(deco.adsorbable === undefined ? true : deco.adsorbable);
|
|
238
285
|
// 同步选中状态
|
|
239
286
|
entity.selected = !!(node === null || node === void 0 ? void 0 : node.selected);
|
|
240
287
|
// 更新zIndex, 每次都要更新,因为节点拖拽会导致所有的zIndex顺序错乱
|
|
@@ -258,7 +305,9 @@ export class SelectionEntityManager {
|
|
|
258
305
|
scrollToSelectedNodes() {
|
|
259
306
|
const entitiesScrollTo = [];
|
|
260
307
|
for (const entity of this.nodeEntitiesCache.values()) {
|
|
261
|
-
if (!Editor2dNode.isRootNode(entity.node) &&
|
|
308
|
+
if (!Editor2dNode.isRootNode(entity.node) &&
|
|
309
|
+
entity.node &&
|
|
310
|
+
entity.selectable) {
|
|
262
311
|
if (!entity.selected && entity.node.selected) {
|
|
263
312
|
entitiesScrollTo.push(entity);
|
|
264
313
|
}
|
|
@@ -270,10 +319,11 @@ export class SelectionEntityManager {
|
|
|
270
319
|
// this.context.syncToSelectionService(this);
|
|
271
320
|
if (entitiesScrollTo.length > 0) {
|
|
272
321
|
// 滚动画布到选中的节点
|
|
273
|
-
this.entityManager
|
|
322
|
+
this.entityManager
|
|
323
|
+
.getEntity(PlaygroundConfigEntity)
|
|
324
|
+
.scrollToView({ entities: entitiesScrollTo });
|
|
274
325
|
}
|
|
275
326
|
}
|
|
276
|
-
;
|
|
277
327
|
/**
|
|
278
328
|
* 获取所有实体的外围最大矩形
|
|
279
329
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":"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"}
|
|
@@ -67,10 +67,10 @@ export const getPIXILocalBoundsByNode = (obj) => {
|
|
|
67
67
|
? { x: 0, y: 0, height: 0, width: 0 }
|
|
68
68
|
: Bounds.getBounds(data, transformData);
|
|
69
69
|
return {
|
|
70
|
-
x: toFixedValue(bounds.x,
|
|
71
|
-
y: toFixedValue(bounds.y,
|
|
72
|
-
maxX: toFixedValue(bounds.x + bounds.width,
|
|
73
|
-
maxY: toFixedValue(bounds.y + bounds.height,
|
|
70
|
+
x: toFixedValue(bounds.x, 2),
|
|
71
|
+
y: toFixedValue(bounds.y, 2),
|
|
72
|
+
maxX: toFixedValue(bounds.x + bounds.width, 2),
|
|
73
|
+
maxY: toFixedValue(bounds.y + bounds.height, 2),
|
|
74
74
|
isMask: c.isMask,
|
|
75
75
|
mask: c.mask,
|
|
76
76
|
id: c.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAGL,UAAU,EAEV,cAAc,EACd,OAAO,EACP,eAAe,EACf,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAK1G;AAID,qBAAa,eAAgB,SAAQ,cAAc;IAS/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IARvC,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACnD,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,CAAM;IAC/C,SAAS,CAAC,eAAe,gBAAuB;IAChD,QAAQ,CAAC,QAAQ,qCAA8B;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;gBAEb,IAAI,EAAE,YAAY;IAmBvC;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAO7C,kBAAkB,IAAI,QAAQ,EAAE;IAGhC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAGvC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAGL,UAAU,EAEV,cAAc,EACd,OAAO,EACP,eAAe,EACf,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAK1G;AAID,qBAAa,eAAgB,SAAQ,cAAc;IAS/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IARvC,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACnD,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,CAAM;IAC/C,SAAS,CAAC,eAAe,gBAAuB;IAChD,QAAQ,CAAC,QAAQ,qCAA8B;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;gBAEb,IAAI,EAAE,YAAY;IAmBvC;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAO7C,kBAAkB,IAAI,QAAQ,EAAE;IAGhC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAGvC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAqDlC,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY;IAQxC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;IA0BrC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;IACxB,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAAE,OAAO,SAAM,EAAE,KAAK,SAAO,GAAG,UAAU;CAsBnH"}
|
|
@@ -83,11 +83,12 @@ export class SnapshotCreator extends DisposableImpl {
|
|
|
83
83
|
const { drawer } = this;
|
|
84
84
|
const dispose = new DisposableCollection();
|
|
85
85
|
dispose.push(Disposable.create(() => {
|
|
86
|
-
var _a, _b;
|
|
86
|
+
var _a, _b, _c;
|
|
87
87
|
deferred.resolve();
|
|
88
88
|
this.current = undefined;
|
|
89
89
|
this.processing = undefined;
|
|
90
90
|
(_b = (_a = this.drawer.renderWidget) === null || _a === void 0 ? void 0 : _a.currentScene) === null || _b === void 0 ? void 0 : _b.dispose();
|
|
91
|
+
(_c = this.drawer.renderWidget) === null || _c === void 0 ? void 0 : _c.dispose();
|
|
91
92
|
}));
|
|
92
93
|
dispose.push(drawer.onLoading(e => {
|
|
93
94
|
const { allCount, currentCount } = e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gedit/editor-2d",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.11",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "lib/browser/index",
|
|
6
6
|
"typings": "lib/browser/index.d.ts",
|
|
@@ -9,13 +9,13 @@
|
|
|
9
9
|
"src"
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@gedit/app-config": "^0.3.
|
|
13
|
-
"@gedit/canvas-draw": "^0.3.
|
|
14
|
-
"@gedit/editor": "^0.3.
|
|
15
|
-
"@gedit/playground": "^0.3.
|
|
16
|
-
"@gedit/render-engine-ide": "^0.3.
|
|
17
|
-
"@gedit/theme": "^0.2.
|
|
18
|
-
"@gedit/workspace-2d": "^0.3.
|
|
12
|
+
"@gedit/app-config": "^0.3.11",
|
|
13
|
+
"@gedit/canvas-draw": "^0.3.9",
|
|
14
|
+
"@gedit/editor": "^0.3.4",
|
|
15
|
+
"@gedit/playground": "^0.3.9",
|
|
16
|
+
"@gedit/render-engine-ide": "^0.3.9",
|
|
17
|
+
"@gedit/theme": "^0.2.15",
|
|
18
|
+
"@gedit/workspace-2d": "^0.3.9",
|
|
19
19
|
"@types/bezier-js": "^4.1.3",
|
|
20
20
|
"bezier-js": "^6.1.4",
|
|
21
21
|
"clsx": "^1.1.1",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"nyc": {
|
|
42
42
|
"extends": "../../configs/nyc.json"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "b3edb6e922b25f2cb87ef3479e6c5f7e1a0e8309"
|
|
45
45
|
}
|
|
@@ -50,7 +50,7 @@ import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
|
|
|
50
50
|
import { ConfirmDialog } from '@gedit/layout';
|
|
51
51
|
import { toFixedValue } from '@gedit/canvas-draw';
|
|
52
52
|
import { getPIXILocalBoundsByNode } from '../utils/bounds';
|
|
53
|
-
import { sortFrame } from './utils';
|
|
53
|
+
import { sortFrame, deepDataChangeByFixed } from './utils';
|
|
54
54
|
// import { getAnimationKeys, getChangeAnimationData } from './utils';
|
|
55
55
|
|
|
56
56
|
export const maskShowArray: GameObjectType[] = [
|
|
@@ -85,6 +85,8 @@ export const Editor2dComponentProvider = Symbol('Editor2dComponentProvider');
|
|
|
85
85
|
const replaceReg = (s: string) => s.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
|
|
86
86
|
|
|
87
87
|
export interface TimelineService {
|
|
88
|
+
onTimelineCurrentTimeChange: Event<number>;
|
|
89
|
+
onTimelineChangeData: Event<TimelineData | undefined>;
|
|
88
90
|
getAnimationIds: () => string[]
|
|
89
91
|
changeTimelineData: (e: Editor2dNode) => void;
|
|
90
92
|
saveTimelineData: (
|
|
@@ -276,7 +278,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
276
278
|
parentNode = Editor2dNode.toContainerNode(parent);
|
|
277
279
|
}
|
|
278
280
|
// const lastChild = parentNode.children.slice().reverse().find(c => c.position !== undefined);
|
|
279
|
-
const attrs = this.engineService.getDisplayDefaultData(this.engineName, displayType);
|
|
281
|
+
const attrs = deepClone(this.engineService.getDisplayDefaultData(this.engineName, displayType));
|
|
280
282
|
if (attrs.position) {
|
|
281
283
|
if (!position) {
|
|
282
284
|
const pos = 100 + Math.round(Math.random() * 100);
|
|
@@ -285,8 +287,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
285
287
|
y: pos
|
|
286
288
|
} : {x: 0, y: 0};
|
|
287
289
|
}
|
|
288
|
-
attrs.position.x = position.x;
|
|
289
|
-
attrs.position.y = position.y;
|
|
290
|
+
attrs.position.x = toFixedValue(position.x, 2);
|
|
291
|
+
attrs.position.y = toFixedValue(position.y, 2);
|
|
290
292
|
// if (position) {
|
|
291
293
|
// attrs.position.x = position.x;
|
|
292
294
|
// attrs.position.y = position.y;
|
|
@@ -556,7 +558,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
556
558
|
}
|
|
557
559
|
}
|
|
558
560
|
|
|
559
|
-
updateAnimationNode(node: Editor2dNode,
|
|
561
|
+
updateAnimationNode(node: Editor2dNode, d: Partial<Editor2dNode>): void {
|
|
560
562
|
if (!this.timelineService) {
|
|
561
563
|
return;
|
|
562
564
|
}
|
|
@@ -572,6 +574,10 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
572
574
|
new Set(animItem.frame.value.map((item: FrameChild) => item.key)),
|
|
573
575
|
);
|
|
574
576
|
|
|
577
|
+
// clone 数据,,子级是对象会被复用,需要深度克隆;
|
|
578
|
+
// 属性栏更新数据会传回来 Editor2dNode; 清除不需要的数据
|
|
579
|
+
const data = deepClone(omit(d, ['nextSibling', 'previousSibling', 'parent']));
|
|
580
|
+
// console.log(data.size);
|
|
575
581
|
Object.keys(animItem.frame.current).forEach(key => {
|
|
576
582
|
if (!keys.includes(key)) {
|
|
577
583
|
const currentValue = getByKey(data, key);
|
|
@@ -589,7 +595,9 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
589
595
|
if (typeof currentValue === 'undefined') {
|
|
590
596
|
return;
|
|
591
597
|
}
|
|
592
|
-
|
|
598
|
+
const dataChangeBool = deepDataChangeByFixed(animItem.frame.current[key], currentValue);
|
|
599
|
+
// console.log('dataChangeBool', dataChangeBool, key, animItem.frame.current[key], currentValue);
|
|
600
|
+
if (dataChangeBool) {
|
|
593
601
|
animItem.frame.current[key] = currentValue ?? animItem.frame.current[key];
|
|
594
602
|
// 判断是否有帧
|
|
595
603
|
const frame = animItem.frame.value.find(
|
|
@@ -621,9 +629,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
621
629
|
}, data);
|
|
622
630
|
});
|
|
623
631
|
|
|
624
|
-
|
|
625
|
-
const newData = omit(data, ['nextSibling', 'previousSibling', 'parent']);
|
|
626
|
-
const nodeData = coverData(node, newData);
|
|
632
|
+
const nodeData = coverData(node, data);
|
|
627
633
|
const gameObject = this.getGameObjectById(node.id);
|
|
628
634
|
if (gameObject) {
|
|
629
635
|
gameObject.data = {
|
|
@@ -803,8 +809,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
803
809
|
const { x: minX, y: minY, maxX, maxY } = currentBound;
|
|
804
810
|
const width = maxX - minX;
|
|
805
811
|
const height = maxY - minY;
|
|
806
|
-
const x: number = toFixedValue(-minX / width || 0,
|
|
807
|
-
const y: number = toFixedValue(-minY / height || 0,
|
|
812
|
+
const x: number = toFixedValue(-minX / width || 0, 2);
|
|
813
|
+
const y: number = toFixedValue(-minY / height || 0, 2);
|
|
808
814
|
if (
|
|
809
815
|
useNode.size?.width !== width ||
|
|
810
816
|
useNode.size?.height !== height ||
|
|
@@ -849,7 +855,11 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
849
855
|
this.onSavedEmitter.fire({document: this, contentChanges: contents, nodes, type});
|
|
850
856
|
}
|
|
851
857
|
// pixi 组件的宽高是计算的,如果是组件,更新数据将需要同步到组件中
|
|
852
|
-
if (
|
|
858
|
+
if (
|
|
859
|
+
(this.appConfig.engineName === 'pixi' ||
|
|
860
|
+
this.appConfig.engineName === 'galacean') &&
|
|
861
|
+
this.root?.displayType === GameObjectBaseType.COMPONENT
|
|
862
|
+
) {
|
|
853
863
|
clearTimeout(this.syncTimeout);
|
|
854
864
|
this.syncTimeout = setTimeout(() => {
|
|
855
865
|
// console.log(node, this.document?.uri);
|
|
@@ -4,6 +4,7 @@ import { RenderEngineIDEService as RenderEngineService } from '@gedit/render-eng
|
|
|
4
4
|
import { SchemaDecoration, SchemaType } from '@gedit/playground';
|
|
5
5
|
import { Editor2dNode } from '../editor2d';
|
|
6
6
|
import { getByKey, setByKey } from '@gedit/utils';
|
|
7
|
+
import { toFixedValue } from '@gedit/canvas-draw';
|
|
7
8
|
|
|
8
9
|
interface KeysValue {
|
|
9
10
|
key: string;
|
|
@@ -16,6 +17,7 @@ export const animArrayKeys: { [key: string]: string } = {
|
|
|
16
17
|
'style.color': 'FillArray',
|
|
17
18
|
'style.line': 'LineArray',
|
|
18
19
|
'style.lineDash': 'LineDashArray',
|
|
20
|
+
'path.paths': 'PathMorphArray',
|
|
19
21
|
};
|
|
20
22
|
function readAnimationKeys(
|
|
21
23
|
deco: SchemaDecoration,
|
|
@@ -97,3 +99,25 @@ export const sortFrame = (v: FrameValue) => {
|
|
|
97
99
|
v.sort((a, b) => a.time - b.time);
|
|
98
100
|
return v;
|
|
99
101
|
};
|
|
102
|
+
|
|
103
|
+
// 精度到 6 位作比较;
|
|
104
|
+
export const deepDataChangeByFixed = (start: any, end: any): boolean => {
|
|
105
|
+
if (start === end) {
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
if (typeof start === 'number' && typeof end === 'number') {
|
|
110
|
+
return toFixedValue(start, 2) !== toFixedValue(end, 2);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
return Object.keys(start).some(key => {
|
|
114
|
+
const startValue = start[key];
|
|
115
|
+
const endValue = end[key];
|
|
116
|
+
if (typeof startValue === 'object' && typeof endValue === 'object') {
|
|
117
|
+
return deepDataChangeByFixed(startValue, endValue);
|
|
118
|
+
} else if (typeof startValue === 'number' && typeof endValue === 'number') {
|
|
119
|
+
return toFixedValue(startValue, 2) !== toFixedValue(endValue, 2);
|
|
120
|
+
}
|
|
121
|
+
return startValue !== endValue;
|
|
122
|
+
});
|
|
123
|
+
};
|
|
@@ -107,8 +107,9 @@ export class AnimPathEditLayer extends Layer<PlaygroundContext2d> {
|
|
|
107
107
|
this.context.animPathSelection?.clearSelection();
|
|
108
108
|
}
|
|
109
109
|
}),
|
|
110
|
-
|
|
111
|
-
|
|
110
|
+
this.selectionService!.onSelectionChanged(e => {
|
|
111
|
+
this.context.animPathSelection?.clearSelection();
|
|
112
|
+
}),
|
|
112
113
|
this.context.animPathSelection.onSelectionChanged(() => {
|
|
113
114
|
this.draw();
|
|
114
115
|
}),
|
|
@@ -205,7 +206,7 @@ export class AnimPathEditLayer extends Layer<PlaygroundContext2d> {
|
|
|
205
206
|
currentFrame.forEach((c: any) => {
|
|
206
207
|
const keys = c.key.split('.');
|
|
207
208
|
const key = keys[1] as 'x' | 'y';
|
|
208
|
-
const value = toFixedValue(key === 'x' ? x : y,
|
|
209
|
+
const value = toFixedValue(key === 'x' ? x : y, 2);
|
|
209
210
|
const diff = currentPoint[key] - value;
|
|
210
211
|
c.value = value;
|
|
211
212
|
if ('bezierSV' in c) {
|
|
@@ -422,7 +423,10 @@ export class AnimPathEditLayer extends Layer<PlaygroundContext2d> {
|
|
|
422
423
|
scale={this.config.finalScale}
|
|
423
424
|
paths={path}
|
|
424
425
|
noBezier={attrSplit.includes('position')}
|
|
425
|
-
selection={
|
|
426
|
+
selection={
|
|
427
|
+
this.context.animPathSelection
|
|
428
|
+
?.selection as PathPointSelection<number>[]
|
|
429
|
+
}
|
|
426
430
|
onPointMouseDown={this.onPointMouseDown.bind(this)}
|
|
427
431
|
onBezierPointMouseDown={this.onBezierPointMouseDown.bind(this)}
|
|
428
432
|
onCancelSelection={() => {
|
|
@@ -263,7 +263,7 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
263
263
|
if (this.renderWidget) this.renderWidget.dispose();
|
|
264
264
|
// pixi webgl 会有内存泄漏而崩溃,所以延迟删除
|
|
265
265
|
},
|
|
266
|
-
this.engineName === 'pixi' ||
|
|
266
|
+
this.engineName === 'pixi' || this.engineName === 'galacean' ||
|
|
267
267
|
(this.renderWidget?.currentScene &&
|
|
268
268
|
'usePixi' in this.renderWidget?.currentScene)
|
|
269
269
|
? 0
|
|
@@ -426,7 +426,9 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
426
426
|
renderKeys,
|
|
427
427
|
childInside || isInside,
|
|
428
428
|
nodePath,
|
|
429
|
-
|
|
429
|
+
(this.engineName === 'dom' &&
|
|
430
|
+
(componentScene?.engine || node.scene?.engine)) ||
|
|
431
|
+
this.engineName
|
|
430
432
|
);
|
|
431
433
|
}
|
|
432
434
|
}
|
|
@@ -825,7 +827,8 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
825
827
|
return;
|
|
826
828
|
}
|
|
827
829
|
this.engineName =
|
|
828
|
-
(
|
|
830
|
+
(engineName === 'dom' &&
|
|
831
|
+
content.displayType === GameObjectBaseType.COMPONENT &&
|
|
829
832
|
content.scene?.engine) ||
|
|
830
833
|
engineName;
|
|
831
834
|
const visibleChanged = this.toggleVisible(appConfig, visible);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { entity, Layer, PipelineDimension } from '@gedit/playground';
|
|
2
|
-
import { DocumentEntity
|
|
2
|
+
import { DocumentEntity /* Editor2dEntity */ } from './entities';
|
|
3
3
|
import { domUtils } from '@gedit/utils/lib/browser';
|
|
4
4
|
import { PlaygroundContext2d } from './playground-context';
|
|
5
5
|
import { Editor2dDocument, Editor2dNode } from '../model';
|
|
@@ -11,13 +11,13 @@ import {
|
|
|
11
11
|
GameObjectChangeEvent,
|
|
12
12
|
GameObjectEventType,
|
|
13
13
|
} from './canvas-draw';
|
|
14
|
-
import { debounce
|
|
14
|
+
import { debounce /* OriginSchema */ } from '@gedit/utils';
|
|
15
15
|
import {
|
|
16
16
|
GameObject,
|
|
17
|
-
GameObjectBaseType,
|
|
17
|
+
// GameObjectBaseType,
|
|
18
18
|
GameWidgetIDE,
|
|
19
19
|
} from '@gedit/render-engine-ide';
|
|
20
|
-
import { toFixedValue } from '@gedit/canvas-draw';
|
|
20
|
+
// import { toFixedValue } from '@gedit/canvas-draw';
|
|
21
21
|
|
|
22
22
|
const childrenMap = (list: GameObject[], c: GameObject) => {
|
|
23
23
|
if (c.disposed) {
|
|
@@ -128,9 +128,15 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
128
128
|
);
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
|
+
// pixi 和 galacean 的画布会被立即杀掉,这块初始化逻辑不需要了
|
|
132
|
+
/* originTimeout: NodeJS.Timeout;
|
|
131
133
|
onContainerInitOrigin(entity?: Editor2dEntity, update?: boolean): void {
|
|
132
134
|
const config = this.documentEntity.config;
|
|
133
|
-
if (
|
|
135
|
+
if (
|
|
136
|
+
(config.appConfig?.engine !== 'pixi' &&
|
|
137
|
+
config.appConfig?.engine !== 'galacean') ||
|
|
138
|
+
!entity
|
|
139
|
+
) {
|
|
134
140
|
return;
|
|
135
141
|
}
|
|
136
142
|
const node = this.nodeCache.get(entity.id);
|
|
@@ -142,8 +148,8 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
142
148
|
// console.log(localBounds, entity.gameObject.rendererObject._localBoundsRect);
|
|
143
149
|
const { x: minX, y: minY, width, height } = localBounds; // entity.gameObject.rendererObject._localBoundsRect;
|
|
144
150
|
// 算出组件与组的 0 点位置;
|
|
145
|
-
const x = toFixedValue(-minX / width || 0,
|
|
146
|
-
const y = toFixedValue(-minY / height || 0,
|
|
151
|
+
const x = toFixedValue(-minX / width || 0, 2);
|
|
152
|
+
const y = toFixedValue(-minY / height || 0, 2);
|
|
147
153
|
const initOrigin = { x, y };
|
|
148
154
|
const o: OriginSchema = update ? org : initOrigin;
|
|
149
155
|
if (update || typeof o.initX === 'undefined') {
|
|
@@ -156,15 +162,20 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
156
162
|
};
|
|
157
163
|
// group origin 始终为 0;
|
|
158
164
|
// transform.update({ origin });
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
165
|
+
// node.origin = origin;
|
|
166
|
+
// 加 timeout 是为了防止拖动时多次触发;
|
|
167
|
+
clearTimeout(this.originTimeout);
|
|
168
|
+
this.originTimeout = setTimeout(() => {
|
|
169
|
+
this.document?.updateNode(node, {
|
|
170
|
+
origin,
|
|
171
|
+
});
|
|
172
|
+
}, 33);
|
|
173
|
+
// console.log('--------------origin--------------', origin, node.size);
|
|
163
174
|
// obj.data.origin = origin;
|
|
164
175
|
// this.selectionEntityManager.updateEntity(obj.id, obj);
|
|
165
176
|
}
|
|
166
177
|
}
|
|
167
|
-
}
|
|
178
|
+
} */
|
|
168
179
|
onUpdateEntity = debounce((update: boolean) => {
|
|
169
180
|
const updateList = getListData(this.updateList);
|
|
170
181
|
updateList.forEach(item => {
|
|
@@ -177,8 +188,8 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
177
188
|
item,
|
|
178
189
|
this.config.config.zoom
|
|
179
190
|
);
|
|
180
|
-
const entity = this.selectionEntityManager.nodeEntitiesCache.get(item.id);
|
|
181
|
-
this.onContainerInitOrigin(entity, update);
|
|
191
|
+
// const entity = this.selectionEntityManager.nodeEntitiesCache.get(item.id);
|
|
192
|
+
// this.onContainerInitOrigin(entity, update);
|
|
182
193
|
});
|
|
183
194
|
this.updateList = [];
|
|
184
195
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import clsx from 'clsx';
|
|
3
|
-
import { asVec, defaultGradientRange } from '@gedit/canvas-draw';
|
|
3
|
+
import { asVec, defaultGradientRange, toFixedValue } from '@gedit/canvas-draw';
|
|
4
4
|
import PointEvent from './gradient-edit-layer-point-event';
|
|
5
5
|
import { GradientNodeProps } from './gradient-node';
|
|
6
6
|
|
|
@@ -40,7 +40,7 @@ export const GradientConicNode = (props: GradientNodeProps): JSX.Element => {
|
|
|
40
40
|
const newVec = asVec({ x: r, y: r }, { x: nx, y: ny });
|
|
41
41
|
const newAngle = ((newVec.ang / Math.PI) * 180 + 360) % 360;
|
|
42
42
|
const newRange = data.range || {};
|
|
43
|
-
newRange.angle =
|
|
43
|
+
newRange.angle = toFixedValue(newAngle, 2);
|
|
44
44
|
data.range = newRange;
|
|
45
45
|
onChange(data);
|
|
46
46
|
}}
|
|
@@ -95,8 +95,8 @@ export const GradientConicNode = (props: GradientNodeProps): JSX.Element => {
|
|
|
95
95
|
pointClassName="gedit-extend-origin"
|
|
96
96
|
onChange={d => {
|
|
97
97
|
const newRange = data.range || {};
|
|
98
|
-
newRange.cx =
|
|
99
|
-
newRange.cy =
|
|
98
|
+
newRange.cx = toFixedValue(cx + d.x / width, 2);
|
|
99
|
+
newRange.cy = toFixedValue(cy + d.y / height, 2);
|
|
100
100
|
data.range = newRange;
|
|
101
101
|
onChange(data);
|
|
102
102
|
}}
|