@gedit/editor-2d 0.2.75 → 0.3.1
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 +15 -2
- package/lib/browser/model/editor2d-document.d.ts.map +1 -1
- package/lib/browser/model/editor2d-document.js +48 -0
- package/lib/browser/model/editor2d-document.js.map +1 -1
- package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
- package/lib/browser/playground/canvas-draw.js +21 -5
- package/lib/browser/playground/canvas-draw.js.map +1 -1
- package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
- package/lib/browser/playground/canvas-layer.js +18 -11
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/lib/browser/utils/bounds.d.ts +14 -0
- package/lib/browser/utils/bounds.d.ts.map +1 -0
- package/lib/browser/utils/bounds.js +108 -0
- package/lib/browser/utils/bounds.js.map +1 -0
- package/lib/browser/utils/snapshot.d.ts +2 -0
- package/lib/browser/utils/snapshot.d.ts.map +1 -1
- package/lib/browser/utils/snapshot.js +3 -2
- package/lib/browser/utils/snapshot.js.map +1 -1
- package/package.json +10 -9
- package/src/browser/model/editor2d-document.ts +82 -2
- package/src/browser/playground/canvas-draw.ts +34 -8
- package/src/browser/playground/canvas-layer.ts +79 -40
- package/src/browser/utils/bounds.ts +136 -0
- package/src/browser/utils/snapshot.ts +6 -3
|
@@ -64,7 +64,9 @@ const getListData = (list) => {
|
|
|
64
64
|
childrenMap(updateList, item.parent);
|
|
65
65
|
}
|
|
66
66
|
});
|
|
67
|
-
updateList = updateList
|
|
67
|
+
updateList = updateList
|
|
68
|
+
.filter(c => !c.disposed)
|
|
69
|
+
.sort((a, b) => {
|
|
68
70
|
var _a, _b;
|
|
69
71
|
const aa = ((_a = a.getDepth) === null || _a === void 0 ? void 0 : _a.call(a)) || 0;
|
|
70
72
|
const bb = ((_b = b.getDepth) === null || _b === void 0 ? void 0 : _b.call(b)) || 0;
|
|
@@ -126,7 +128,10 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
126
128
|
const { visible } = this.documentEntity.config;
|
|
127
129
|
// const resolution = appConfig?.resolution || 1;
|
|
128
130
|
const size = (_a = this.canvasDrawer) === null || _a === void 0 ? void 0 : _a.getSceneSize();
|
|
129
|
-
if (!visible ||
|
|
131
|
+
if (!visible ||
|
|
132
|
+
!size ||
|
|
133
|
+
this.config.config.width === 0 ||
|
|
134
|
+
this.config.config.height === 0)
|
|
130
135
|
return;
|
|
131
136
|
const newRect = new math_1.Rectangle(0, 0, size.width, size.height);
|
|
132
137
|
if (!this.currentRectangle || !this.currentRectangle.isEqual(newRect)) {
|
|
@@ -134,7 +139,8 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
134
139
|
// this.currentResolution = resolution;
|
|
135
140
|
// this.config.updateConfig({resolution});
|
|
136
141
|
this.config.setPageBounds(newRect);
|
|
137
|
-
this.config
|
|
142
|
+
this.config
|
|
143
|
+
.scrollPageBoundsToCenter(true, 16, !this.context.options.isTemplate)
|
|
138
144
|
.then(() => this.onZoom());
|
|
139
145
|
}
|
|
140
146
|
}, 100); // 打开时会有一次 tag 大小的视图,宽是 98px,,dom 下没有引擎加载,会响应 98 宽,加 100 ms 延时
|
|
@@ -179,14 +185,14 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
179
185
|
const node = this.nodeCache.get(entity.id);
|
|
180
186
|
const type = node === null || node === void 0 ? void 0 : node.displayType;
|
|
181
187
|
// 分组与组件创建完后初始化中心点;
|
|
182
|
-
if (node &&
|
|
188
|
+
if (node && type === render_engine_ide_1.GameObjectBaseType.COMPONENT) {
|
|
183
189
|
const { transform } = entity;
|
|
184
190
|
const { origin: org, localBounds } = transform;
|
|
185
191
|
// console.log(localBounds, entity.gameObject.rendererObject._localBoundsRect);
|
|
186
192
|
const { x: minX, y: minY, width, height } = localBounds; // entity.gameObject.rendererObject._localBoundsRect;
|
|
187
193
|
// 算出组件与组的 0 点位置;
|
|
188
|
-
const x = (0, canvas_draw_2.toFixedValue)(
|
|
189
|
-
const y = (0, canvas_draw_2.toFixedValue)(
|
|
194
|
+
const x = (0, canvas_draw_2.toFixedValue)(-minX / width || 0, 6);
|
|
195
|
+
const y = (0, canvas_draw_2.toFixedValue)(-minY / height || 0, 6);
|
|
190
196
|
const initOrigin = { x, y };
|
|
191
197
|
const o = update ? org : initOrigin;
|
|
192
198
|
if (update || typeof o.initX === 'undefined') {
|
|
@@ -195,7 +201,7 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
195
201
|
x: o.x || 0,
|
|
196
202
|
y: o.y || 0,
|
|
197
203
|
initX: initOrigin.x || 0,
|
|
198
|
-
initY: initOrigin.y || 0
|
|
204
|
+
initY: initOrigin.y || 0,
|
|
199
205
|
};
|
|
200
206
|
// group origin 始终为 0;
|
|
201
207
|
// transform.update({ origin });
|
|
@@ -208,7 +214,6 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
208
214
|
}
|
|
209
215
|
}
|
|
210
216
|
}
|
|
211
|
-
;
|
|
212
217
|
onGameObjectChange(e) {
|
|
213
218
|
var _a, _b;
|
|
214
219
|
const { gameObject, state, node } = e;
|
|
@@ -259,13 +264,15 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
259
264
|
this.config.loading = true;
|
|
260
265
|
this.node.classList.remove('ready');
|
|
261
266
|
this.config.updateConfig({
|
|
262
|
-
loadingHTML: `${Math.round(currentCount / allCount * 100)}
|
|
267
|
+
loadingHTML: `${Math.round((currentCount / allCount) * 100)}%`,
|
|
263
268
|
});
|
|
264
269
|
}
|
|
265
270
|
}
|
|
266
271
|
loaded() {
|
|
267
272
|
// TODO 目前只有模板编辑器需要触发
|
|
268
|
-
if (!this.canvasDrawer ||
|
|
273
|
+
if (!this.canvasDrawer ||
|
|
274
|
+
this.config.loading ||
|
|
275
|
+
!this.context.options.isTemplate)
|
|
269
276
|
return;
|
|
270
277
|
for (const item of this.canvasDrawer.gameObjectCache.values()) {
|
|
271
278
|
if (item.onSceneCreated) {
|
|
@@ -289,7 +296,7 @@ class CanvasLayer extends playground_1.Layer {
|
|
|
289
296
|
engineName: ((_b = config.appConfig) === null || _b === void 0 ? void 0 : _b.engine) || '',
|
|
290
297
|
appConfig: config.appConfig,
|
|
291
298
|
configVersion: config.configVersion,
|
|
292
|
-
uri: document === null || document === void 0 ? void 0 : document.uri
|
|
299
|
+
uri: document === null || document === void 0 ? void 0 : document.uri,
|
|
293
300
|
});
|
|
294
301
|
/**
|
|
295
302
|
* 尝试触发居中
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"canvas-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { GameObjectData } from '@gedit/render-engine/lib/common';
|
|
2
|
+
interface ChildBounds {
|
|
3
|
+
x: number;
|
|
4
|
+
y: number;
|
|
5
|
+
maxX: number;
|
|
6
|
+
maxY: number;
|
|
7
|
+
isGroup?: boolean;
|
|
8
|
+
isMask?: boolean;
|
|
9
|
+
mask?: string;
|
|
10
|
+
id?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare const getPIXILocalBoundsByNode: (obj: GameObjectData) => ChildBounds;
|
|
13
|
+
export {};
|
|
14
|
+
//# sourceMappingURL=bounds.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bounds.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/bounds.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,cAAc,EACf,MAAM,iCAAiC,CAAC;AAEzC,UAAU,WAAW;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAyBD,eAAO,MAAM,wBAAwB,QAAS,cAAc,KAAG,WA6F9D,CAAC"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPIXILocalBoundsByNode = void 0;
|
|
4
|
+
const canvas_draw_1 = require("@gedit/canvas-draw");
|
|
5
|
+
const math_1 = require("@gedit/math");
|
|
6
|
+
const bounds_1 = require("@gedit/playground/lib/common/utils/bounds");
|
|
7
|
+
const common_1 = require("@gedit/render-engine/lib/common");
|
|
8
|
+
const ignoreBounds = [
|
|
9
|
+
common_1.GameObjectBaseType.ANIMATION,
|
|
10
|
+
common_1.GameObjectBaseType.AUDIO,
|
|
11
|
+
common_1.GameObjectBaseType.CAMERA,
|
|
12
|
+
];
|
|
13
|
+
const boundsMask = (bounds, maskBounds) => {
|
|
14
|
+
if (!maskBounds) {
|
|
15
|
+
return bounds;
|
|
16
|
+
}
|
|
17
|
+
const minX = bounds.x > maskBounds.x ? bounds.x : maskBounds.x;
|
|
18
|
+
const minY = bounds.y > maskBounds.y ? bounds.y : maskBounds.y;
|
|
19
|
+
const maxX = bounds.maxX < maskBounds.maxX ? bounds.maxX : maskBounds.maxX;
|
|
20
|
+
const maxY = bounds.maxY < maskBounds.maxY ? bounds.maxY : maskBounds.maxY;
|
|
21
|
+
if (minX <= maxX && minY <= maxY) {
|
|
22
|
+
return { x: minX, y: minY, maxX, maxY };
|
|
23
|
+
}
|
|
24
|
+
return { x: 0, y: 0, maxX: 0, maxY: 0 };
|
|
25
|
+
};
|
|
26
|
+
const getPIXILocalBoundsByNode = (obj) => {
|
|
27
|
+
const children = obj.children || [];
|
|
28
|
+
const bounds = children
|
|
29
|
+
.map(c => {
|
|
30
|
+
var _a, _b, _c, _d, _e;
|
|
31
|
+
const { position = { x: 0, y: 0 }, scale = { x: 1, y: 1 }, rotation = 0, origin = { x: 1, y: 1 }, } = c;
|
|
32
|
+
let width;
|
|
33
|
+
let height;
|
|
34
|
+
if (c.canvasHide) {
|
|
35
|
+
return { x: 0, y: 0, maxX: 0, maxY: 0 };
|
|
36
|
+
}
|
|
37
|
+
if (c.displayType === common_1.GameObjectBaseType.COMPONENT ||
|
|
38
|
+
c.displayType === common_1.GameObjectBaseType.GROUP) {
|
|
39
|
+
if ((_a = c.children) === null || _a === void 0 ? void 0 : _a.length) {
|
|
40
|
+
const childSize = (0, exports.getPIXILocalBoundsByNode)(c);
|
|
41
|
+
console.log(childSize, c);
|
|
42
|
+
width = childSize.maxX - childSize.x;
|
|
43
|
+
height = childSize.maxY - childSize.y;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
width = ((_b = c.size) === null || _b === void 0 ? void 0 : _b.width) || 0;
|
|
47
|
+
height = ((_c = c.size) === null || _c === void 0 ? void 0 : _c.height) || 0;
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
x: position.x - origin.x * width * scale.x,
|
|
51
|
+
y: position.y - origin.y * height * (scale === null || scale === void 0 ? void 0 : scale.y),
|
|
52
|
+
maxX: position.x + (width - origin.x * width) * scale.x,
|
|
53
|
+
maxY: position.y + (height - origin.y * height) * scale.y,
|
|
54
|
+
isGroup: true,
|
|
55
|
+
isMask: c.isMask,
|
|
56
|
+
mask: c.mask,
|
|
57
|
+
id: c.id,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
const transformData = new math_1.Matrix();
|
|
61
|
+
// data 里的 size 已经是缩放后的值了,不需要再乘 scale
|
|
62
|
+
// transformData.scale(scale.x, scale.y);
|
|
63
|
+
transformData.rotate(rotation);
|
|
64
|
+
transformData.translate(position.x, position.y);
|
|
65
|
+
// 文字有误差,,粒子乱飘;
|
|
66
|
+
width = (_d = c.size) === null || _d === void 0 ? void 0 : _d.width;
|
|
67
|
+
height = (_e = c.size) === null || _e === void 0 ? void 0 : _e.height;
|
|
68
|
+
const data = Object.assign(Object.assign({}, c), { size: Object.assign(Object.assign({}, c.size), { width,
|
|
69
|
+
height }) });
|
|
70
|
+
const bounds = ignoreBounds.includes(c.displayType) || c.displayType.match('Filter')
|
|
71
|
+
? { x: 0, y: 0, height: 0, width: 0 }
|
|
72
|
+
: bounds_1.Bounds.getBounds(data, transformData);
|
|
73
|
+
return {
|
|
74
|
+
x: (0, canvas_draw_1.toFixedValue)(bounds.x, 6),
|
|
75
|
+
y: (0, canvas_draw_1.toFixedValue)(bounds.y, 6),
|
|
76
|
+
maxX: (0, canvas_draw_1.toFixedValue)(bounds.x + bounds.width, 6),
|
|
77
|
+
maxY: (0, canvas_draw_1.toFixedValue)(bounds.y + bounds.height, 6),
|
|
78
|
+
isMask: c.isMask,
|
|
79
|
+
mask: c.mask,
|
|
80
|
+
id: c.id,
|
|
81
|
+
};
|
|
82
|
+
})
|
|
83
|
+
.filter(c => c && c.maxX - c.x > 0 && c.maxY - c.y > 0);
|
|
84
|
+
const maskClearBounds = bounds.map(c => {
|
|
85
|
+
if (c.isMask) {
|
|
86
|
+
return { x: 0, y: 0, maxX: 0, maxY: 0 };
|
|
87
|
+
}
|
|
88
|
+
if (c.mask) {
|
|
89
|
+
const maskBounds = bounds.find(d => d.id === c.mask);
|
|
90
|
+
if (maskBounds) {
|
|
91
|
+
return boundsMask(c, maskBounds);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return c;
|
|
95
|
+
});
|
|
96
|
+
const x = Math.min(...maskClearBounds.map(c => c.x));
|
|
97
|
+
const y = Math.min(...maskClearBounds.map(c => c.y));
|
|
98
|
+
const maxX = Math.max(...maskClearBounds.map(c => c.maxX));
|
|
99
|
+
const maxY = Math.max(...maskClearBounds.map(c => c.maxY));
|
|
100
|
+
return {
|
|
101
|
+
x,
|
|
102
|
+
y,
|
|
103
|
+
maxX,
|
|
104
|
+
maxY,
|
|
105
|
+
};
|
|
106
|
+
};
|
|
107
|
+
exports.getPIXILocalBoundsByNode = getPIXILocalBoundsByNode;
|
|
108
|
+
//# sourceMappingURL=bounds.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bounds.js","sourceRoot":"","sources":["../../../src/browser/utils/bounds.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export interface Snapshot {
|
|
|
19
19
|
uri: string;
|
|
20
20
|
name?: string;
|
|
21
21
|
version?: string | number;
|
|
22
|
+
components?: string;
|
|
22
23
|
imageData: string;
|
|
23
24
|
}
|
|
24
25
|
export interface SnapshotInput {
|
|
@@ -26,6 +27,7 @@ export interface SnapshotInput {
|
|
|
26
27
|
name?: string;
|
|
27
28
|
version?: string | number;
|
|
28
29
|
content: Editor2dNode;
|
|
30
|
+
components?: string;
|
|
29
31
|
}
|
|
30
32
|
export declare function createSnapshots(opts: SnapshotOpts, sceneDatas: SnapshotInput[]): Promise<Snapshot[]>;
|
|
31
33
|
export declare class SnapshotCreator extends DisposableImpl {
|
|
@@ -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,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,
|
|
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;IA+ClC,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY;IAQxC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;IA0BrC;;;;;;OAMG;IACH,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAAE,OAAO,SAAM,EAAE,KAAK,SAAO,GAAG,UAAU;CAgBnH"}
|
|
@@ -68,7 +68,7 @@ class SnapshotCreator extends utils_1.DisposableImpl {
|
|
|
68
68
|
async draw(scenes) {
|
|
69
69
|
this.processingData = scenes.filter(s => {
|
|
70
70
|
const result = this.result[s.uri];
|
|
71
|
-
if (result && s.version === result.version)
|
|
71
|
+
if (result && s.version === result.version && result.components === s.components)
|
|
72
72
|
return false;
|
|
73
73
|
if (this.current && this.current.version === s.version)
|
|
74
74
|
return false;
|
|
@@ -106,7 +106,8 @@ class SnapshotCreator extends utils_1.DisposableImpl {
|
|
|
106
106
|
uri: current.uri,
|
|
107
107
|
version: current.version,
|
|
108
108
|
name: current.name,
|
|
109
|
-
imageData
|
|
109
|
+
imageData,
|
|
110
|
+
components: current.components,
|
|
110
111
|
};
|
|
111
112
|
this.onUpdateEmitter.fire();
|
|
112
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,wCAUsB;AAEtB,oCAAwC;AAY3B,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,GAAG;IACZ,SAAS,EAAE,YAAY;CACxB,CAAC;
|
|
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
|
+
"version": "0.3.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "lib/browser/index",
|
|
6
6
|
"typings": "lib/browser/index.d.ts",
|
|
@@ -9,14 +9,15 @@
|
|
|
9
9
|
"src"
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@gedit/app-config": "^0.
|
|
13
|
-
"@gedit/canvas-draw": "^0.2
|
|
14
|
-
"@gedit/editor": "^0.
|
|
15
|
-
"@gedit/playground": "^0.
|
|
16
|
-
"@gedit/render-engine-ide": "^0.
|
|
12
|
+
"@gedit/app-config": "^0.3.1",
|
|
13
|
+
"@gedit/canvas-draw": "^0.3.2",
|
|
14
|
+
"@gedit/editor": "^0.3.0",
|
|
15
|
+
"@gedit/playground": "^0.3.1",
|
|
16
|
+
"@gedit/render-engine-ide": "^0.3.1",
|
|
17
17
|
"@gedit/theme": "^0.2.12",
|
|
18
|
-
"@gedit/workspace-2d": "^0.
|
|
19
|
-
"bezier-js": "^4.
|
|
18
|
+
"@gedit/workspace-2d": "^0.3.1",
|
|
19
|
+
"@types/bezier-js": "^4.1.3",
|
|
20
|
+
"bezier-js": "^6.1.4",
|
|
20
21
|
"clsx": "^1.1.1",
|
|
21
22
|
"json-stringify-pretty-compact": "^2.0.0",
|
|
22
23
|
"nanoid": "^3.3.2"
|
|
@@ -39,5 +40,5 @@
|
|
|
39
40
|
"nyc": {
|
|
40
41
|
"extends": "../../configs/nyc.json"
|
|
41
42
|
},
|
|
42
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "b0e0c21f2ae8448eeef4e53da5a1b1fd316f72b5"
|
|
43
44
|
}
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
debounce,
|
|
12
12
|
PromiseDeferred,
|
|
13
13
|
URI,
|
|
14
|
+
FileStat,
|
|
14
15
|
} from '@gedit/utils';
|
|
15
16
|
import {
|
|
16
17
|
checkDuplicateNodes,
|
|
@@ -20,7 +21,7 @@ import {
|
|
|
20
21
|
Editor2dNode,
|
|
21
22
|
// Editor2dNodeCache,
|
|
22
23
|
} from './editor2d';
|
|
23
|
-
import { GameConfig, GameObject, GameObjectBaseType, GameObjectData, GameObjectType } from '@gedit/render-engine';
|
|
24
|
+
import { ComponentGameObjectData, GameConfig, GameObject, GameObjectBaseType, GameObjectData, GameObjectType } from '@gedit/render-engine';
|
|
24
25
|
import { GameObjectDecoration, RenderEngineIDEService } from '@gedit/render-engine-ide';
|
|
25
26
|
import { CompositeTreeNode, ExpandableTreeNode, Tree, TreeImpl, TreeNode } from '@gedit/tree';
|
|
26
27
|
import { ResourceAutoSaveService } from '@gedit/resource/lib/browser';
|
|
@@ -34,6 +35,8 @@ import { ThemeService } from '@gedit/theme';
|
|
|
34
35
|
import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
|
|
35
36
|
import { ConfirmDialog } from '@gedit/layout';
|
|
36
37
|
import { AssetsMetaData } from '@gedit/assets-2d';
|
|
38
|
+
import { toFixedValue } from '@gedit/canvas-draw';
|
|
39
|
+
import { getPIXILocalBoundsByNode } from '../utils/bounds';
|
|
37
40
|
// import { getAnimationKeys, getChangeAnimationData } from './utils';
|
|
38
41
|
|
|
39
42
|
export const maskShowArray: GameObjectType[] = [
|
|
@@ -71,6 +74,19 @@ export interface Editor2dComponentProvider {
|
|
|
71
74
|
|
|
72
75
|
getScriptsById(uri: string): string[];
|
|
73
76
|
|
|
77
|
+
allResourcesAutoService: Map<string, ResourceAutoSaveService>;
|
|
78
|
+
|
|
79
|
+
all: {
|
|
80
|
+
[key: string]: {
|
|
81
|
+
stat: FileStat;
|
|
82
|
+
lastModification: number;
|
|
83
|
+
version: number;
|
|
84
|
+
content: Editor2dNode;
|
|
85
|
+
};
|
|
86
|
+
};
|
|
87
|
+
|
|
88
|
+
syncUsedContentComponent(content: Editor2dNode, stat: FileStat, version: number): Promise<void>;
|
|
89
|
+
|
|
74
90
|
onComponentChanged: Event<URI>;
|
|
75
91
|
onLoad: Event<void>;
|
|
76
92
|
}
|
|
@@ -92,6 +108,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
92
108
|
public loading = true;
|
|
93
109
|
protected deleteNames: string[] = [];
|
|
94
110
|
|
|
111
|
+
protected syncTimeout: NodeJS.Timeout;
|
|
112
|
+
|
|
95
113
|
get uri(): string {
|
|
96
114
|
return this.options.autoSaveService.resource.uri.toString();
|
|
97
115
|
}
|
|
@@ -103,7 +121,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
103
121
|
constructor(
|
|
104
122
|
@inject(MessageService) readonly message: MessageService,
|
|
105
123
|
@inject(Editor2dModelOptions) protected readonly options: Editor2dModelOptions,
|
|
106
|
-
@inject(ResourceProvider)
|
|
124
|
+
@inject(ResourceProvider) readonly resourceProvider: ResourceProvider,
|
|
107
125
|
@inject(ResourceAutoSaveService) protected readonly resourceAutoSaveService: ResourceAutoSaveService,
|
|
108
126
|
@inject(WorkspaceResourceService) protected readonly resourceService: WorkspaceResourceService,
|
|
109
127
|
@inject(RenderEngineIDEService) readonly engineService: RenderEngineIDEService,
|
|
@@ -132,6 +150,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
132
150
|
this.fireContentChanged([], 'update', true);
|
|
133
151
|
}
|
|
134
152
|
}, 1000)));
|
|
153
|
+
// 保存 resource 到 componentProvider
|
|
154
|
+
this.componentProvider.allResourcesAutoService.set(this.uri, this.resourceAutoSaveService);
|
|
135
155
|
}
|
|
136
156
|
// TODO
|
|
137
157
|
// this.toDispose.push(this.resourceService.onRefsChange(async () => {
|
|
@@ -586,6 +606,58 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
586
606
|
return root;
|
|
587
607
|
}
|
|
588
608
|
|
|
609
|
+
onUpdateUseComponentBounds = async () => {
|
|
610
|
+
if (!this.root) {
|
|
611
|
+
return;
|
|
612
|
+
}
|
|
613
|
+
const currentBound = getPIXILocalBoundsByNode(this.root);
|
|
614
|
+
Object.keys(this.componentProvider?.all || {}).forEach(c => {
|
|
615
|
+
const item = this.componentProvider?.all[c];
|
|
616
|
+
if (
|
|
617
|
+
item?.content?.displayType === GameObjectBaseType.COMPONENT &&
|
|
618
|
+
item.stat.uri !== this.uri
|
|
619
|
+
) {
|
|
620
|
+
const { content, stat, version } = item;
|
|
621
|
+
// 是否用过
|
|
622
|
+
const useNode = content.children?.find(
|
|
623
|
+
(d: ComponentGameObjectData) =>
|
|
624
|
+
d.component && this.uri.match(d.component.id)
|
|
625
|
+
);
|
|
626
|
+
if (useNode) {
|
|
627
|
+
const { x: minX, y: minY, maxX, maxY } = currentBound;
|
|
628
|
+
const width = maxX - minX;
|
|
629
|
+
const height = maxY - minY;
|
|
630
|
+
const x: number = toFixedValue(-minX / width || 0, 6);
|
|
631
|
+
const y: number = toFixedValue(-minY / height || 0, 6);
|
|
632
|
+
if (
|
|
633
|
+
useNode.size?.width !== width ||
|
|
634
|
+
useNode.size?.height !== height ||
|
|
635
|
+
useNode.origin?.initX !== x ||
|
|
636
|
+
useNode.origin?.initY !== y
|
|
637
|
+
) {
|
|
638
|
+
useNode.size = {
|
|
639
|
+
...useNode.size,
|
|
640
|
+
width,
|
|
641
|
+
height,
|
|
642
|
+
};
|
|
643
|
+
if (useNode.origin) {
|
|
644
|
+
useNode.origin = {
|
|
645
|
+
...useNode.origin,
|
|
646
|
+
initX: x,
|
|
647
|
+
initY: y,
|
|
648
|
+
};
|
|
649
|
+
}
|
|
650
|
+
this.componentProvider?.syncUsedContentComponent(
|
|
651
|
+
content,
|
|
652
|
+
stat,
|
|
653
|
+
version
|
|
654
|
+
);
|
|
655
|
+
}
|
|
656
|
+
}
|
|
657
|
+
}
|
|
658
|
+
});
|
|
659
|
+
};
|
|
660
|
+
|
|
589
661
|
fireContentChanged = (nodes: Editor2dNode[], type: 'add' | 'delete' | 'update', noSave?: boolean, noFiredChanged?: boolean): void => {
|
|
590
662
|
// TODO 这里修改目前还是全量的,需要优化
|
|
591
663
|
const contents = nodes.map(n => ({text: 'treeNode'}));
|
|
@@ -600,6 +672,14 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
600
672
|
}
|
|
601
673
|
this.onSavedEmitter.fire({document: this, contentChanges: contents, nodes, type});
|
|
602
674
|
}
|
|
675
|
+
// pixi 组件的宽高是计算的,如果是组件,更新数据将需要同步到组件中
|
|
676
|
+
if (this.appConfig.engineName === 'pixi' && this.root?.displayType === GameObjectBaseType.COMPONENT) {
|
|
677
|
+
clearTimeout(this.syncTimeout);
|
|
678
|
+
this.syncTimeout = setTimeout(() => {
|
|
679
|
+
// console.log(node, this.document?.uri);
|
|
680
|
+
this.onUpdateUseComponentBounds();
|
|
681
|
+
}, 1000);
|
|
682
|
+
}
|
|
603
683
|
};
|
|
604
684
|
|
|
605
685
|
save(): MaybePromise<void> {
|
|
@@ -228,9 +228,17 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
228
228
|
}
|
|
229
229
|
// 延迟删除不可见的游戏对象, 提升性能
|
|
230
230
|
if (!visible && this.renderWidget) {
|
|
231
|
-
const timeoutId = setTimeout(
|
|
232
|
-
|
|
233
|
-
|
|
231
|
+
const timeoutId = setTimeout(
|
|
232
|
+
() => {
|
|
233
|
+
if (this.renderWidget) this.renderWidget.dispose();
|
|
234
|
+
// pixi webgl 会有内存泄漏而崩溃,所以延迟删除
|
|
235
|
+
},
|
|
236
|
+
this.engineName === 'pixi' ||
|
|
237
|
+
(this.renderWidget?.currentScene &&
|
|
238
|
+
'usePixi' in this.renderWidget?.currentScene)
|
|
239
|
+
? 0
|
|
240
|
+
: WAIT_TO_DISPOSE_TIME
|
|
241
|
+
);
|
|
234
242
|
this.waitToDispose = Disposable.create(() => {
|
|
235
243
|
window.clearTimeout(timeoutId);
|
|
236
244
|
});
|
|
@@ -454,7 +462,7 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
454
462
|
gameObject: gameObject!,
|
|
455
463
|
node: n,
|
|
456
464
|
});
|
|
457
|
-
updateParent(n, gameObject);
|
|
465
|
+
updateParent(n.parent, gameObject?.parent);
|
|
458
466
|
this.gameObjectCache.delete(nodePath);
|
|
459
467
|
this.nodeVersionCache.delete(nodePath);
|
|
460
468
|
this.nodeCache.delete(nodePath);
|
|
@@ -544,6 +552,20 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
544
552
|
);
|
|
545
553
|
}
|
|
546
554
|
}
|
|
555
|
+
// 组件变更,刷新 update;
|
|
556
|
+
// TODO: 删除的组件待验;
|
|
557
|
+
let isComponentUpdate = false;
|
|
558
|
+
if (
|
|
559
|
+
!Editor2dNode.isRootNode(node) &&
|
|
560
|
+
gameObject.type === GameObjectBaseType.COMPONENT
|
|
561
|
+
) {
|
|
562
|
+
const oldCompId = (gameObject.data as ComponentGameObjectData).component
|
|
563
|
+
.id;
|
|
564
|
+
const newCompId = (nodeData as Editor2dNode & {
|
|
565
|
+
component: { id: string };
|
|
566
|
+
}).component.id;
|
|
567
|
+
isComponentUpdate = oldCompId !== newCompId;
|
|
568
|
+
}
|
|
547
569
|
const update = () => {
|
|
548
570
|
const oldVersion = this.nodeVersionCache.get(nodePath);
|
|
549
571
|
const oldMask = this.maskCache.get(nodePath);
|
|
@@ -557,7 +579,8 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
557
579
|
nodeChanged ||
|
|
558
580
|
maskChange ||
|
|
559
581
|
oldVersion !== newVersion ||
|
|
560
|
-
compSceneChange
|
|
582
|
+
compSceneChange ||
|
|
583
|
+
isComponentUpdate
|
|
561
584
|
) {
|
|
562
585
|
const d = {
|
|
563
586
|
...nodeData,
|
|
@@ -582,7 +605,7 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
582
605
|
});
|
|
583
606
|
}
|
|
584
607
|
};
|
|
585
|
-
if (!firstCreate && gameObject?.created) {
|
|
608
|
+
if ((!firstCreate && gameObject?.created) || isComponentUpdate) {
|
|
586
609
|
try {
|
|
587
610
|
update();
|
|
588
611
|
} catch (e) {
|
|
@@ -603,7 +626,8 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
603
626
|
protected fireLoading(): void {
|
|
604
627
|
const { allCount: all, maskCache } = this;
|
|
605
628
|
const maskArray = Array.from(maskCache, ([_, value]) => value);
|
|
606
|
-
const allCount =
|
|
629
|
+
const allCount =
|
|
630
|
+
all + maskArray.filter(c => c.mask && !c.ignoreMask).length;
|
|
607
631
|
const maskCount = maskArray.filter(c => c.created).length;
|
|
608
632
|
const currentCount = this.nodeVersionCache.size + maskCount;
|
|
609
633
|
if (currentCount >= allCount) {
|
|
@@ -693,7 +717,9 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
693
717
|
/**
|
|
694
718
|
* 获取画布的宽高
|
|
695
719
|
*/
|
|
696
|
-
getSceneSize(
|
|
720
|
+
getSceneSize(
|
|
721
|
+
scene: GameObjectData['scene'] = this.getSceneSymbolToValue()
|
|
722
|
+
): SizeSchema | undefined {
|
|
697
723
|
if (!this.data) return undefined;
|
|
698
724
|
const { content, appConfig } = this.data;
|
|
699
725
|
if (!appConfig || !content) return undefined;
|