@gedit/editor-2d 0.1.28 → 0.1.30
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/playground/canvas-layer.d.ts +1 -0
- package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
- package/lib/browser/playground/canvas-layer.js +24 -4
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/playground/canvas-layer.ts +23 -4
- package/src/browser/style/canvas-layer.css +4 -0
|
@@ -36,6 +36,7 @@ export declare class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
36
36
|
updateGameObjects(scene: GameSceneIDE, document: Editor2dDocument): void;
|
|
37
37
|
updateGameObject(scene: GameSceneIDE, document: Editor2dDocument, node: Editor2dNode, depth: number, renderKeys: string[]): number;
|
|
38
38
|
get document(): Editor2dDocument | undefined;
|
|
39
|
+
updateScale(): void;
|
|
39
40
|
draw(): void;
|
|
40
41
|
}
|
|
41
42
|
//# sourceMappingURL=canvas-layer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-layer.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAc,MAAM,8BAA8B,CAAC;AAOzE,qBAAa,WAAY,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IACvD,IAAI,iBAAqD;IACzD,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC/D,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAChE,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAC5D,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,CAAM;IACxC,SAAS,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IACzD,SAAS,CAAC,mBAAmB,EAAE,UAAU,GAAG,SAAS,CAAC;IACtD,SAAS,CAAC,aAAa,EAAE,UAAU,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC;IACpC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IACrB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAKpC,OAAO,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"canvas-layer.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAc,MAAM,8BAA8B,CAAC;AAOzE,qBAAa,WAAY,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IACvD,IAAI,iBAAqD;IACzD,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC/D,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAChE,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAC5D,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,CAAM;IACxC,SAAS,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IACzD,SAAS,CAAC,mBAAmB,EAAE,UAAU,GAAG,SAAS,CAAC;IACtD,SAAS,CAAC,aAAa,EAAE,UAAU,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC;IACpC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IACrB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAKpC,OAAO,IAAI,IAAI;IAYf;;;;;OAKG;IACH,aAAa,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAuD3F,YAAY,IAAI,MAAM;IAKtB,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAiBxE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;IAyFlI,IAAI,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAE3C;IACD,WAAW,IAAI,IAAI;IAWnB,IAAI,IAAI,IAAI;CAqCb"}
|
|
@@ -126,7 +126,11 @@ var CanvasLayer = /** @class */ (function (_super) {
|
|
|
126
126
|
this.listenPlaygroundEvent('mousedown', function () {
|
|
127
127
|
_this.context.syncToSelectionTree(_this.selectionEntityManager);
|
|
128
128
|
}, -2),
|
|
129
|
+
this.config.onConfigChanged(function () {
|
|
130
|
+
_this.updateScale();
|
|
131
|
+
})
|
|
129
132
|
]);
|
|
133
|
+
this.config.loading = true;
|
|
130
134
|
};
|
|
131
135
|
/**
|
|
132
136
|
* 在不可见情况下，销毁gameObject，来提升性能
|
|
@@ -147,10 +151,6 @@ var CanvasLayer = /** @class */ (function (_super) {
|
|
|
147
151
|
if (visible && !this.renderWidget) {
|
|
148
152
|
this.appConfig = appConfig;
|
|
149
153
|
var element_1 = window.document.createElement('canvas');
|
|
150
|
-
// // 分辨率
|
|
151
|
-
// domUtils.setStyle(this.node, {
|
|
152
|
-
// transform: `scale(${1 / appConfig.resolution})`
|
|
153
|
-
// });
|
|
154
154
|
this.node.appendChild(element_1);
|
|
155
155
|
this.selectionEntityManager = new selection_entity_manager_1.SelectionEntityManager(this.entityManager, this.context, function () { return _this.document; });
|
|
156
156
|
appConfig = common_1.toAutoSize(appConfig);
|
|
@@ -306,6 +306,18 @@ var CanvasLayer = /** @class */ (function (_super) {
|
|
|
306
306
|
enumerable: false,
|
|
307
307
|
configurable: true
|
|
308
308
|
});
|
|
309
|
+
CanvasLayer.prototype.updateScale = function () {
|
|
310
|
+
var appConfig = this.appConfig;
|
|
311
|
+
if (!appConfig)
|
|
312
|
+
return;
|
|
313
|
+
// 开启缩放
|
|
314
|
+
this.config.enableZoom = true;
|
|
315
|
+
this.config.updateConfig({ resolution: appConfig.resolution });
|
|
316
|
+
// 分辨率
|
|
317
|
+
browser_1.domUtils.setStyle(this.node, {
|
|
318
|
+
transform: "scale(" + this.config.finalScale + ")"
|
|
319
|
+
});
|
|
320
|
+
};
|
|
309
321
|
CanvasLayer.prototype.draw = function () {
|
|
310
322
|
var _a = this.documentEntity.config, document = _a.document, appConfig = _a.appConfig, _b = _a.visible, visible = _b === void 0 ? false : _b;
|
|
311
323
|
if (!this.libLoaded && !this.libLoading) {
|
|
@@ -318,6 +330,7 @@ var CanvasLayer = /** @class */ (function (_super) {
|
|
|
318
330
|
this.toggleVisible(document, appConfig, visible);
|
|
319
331
|
if (!this.renderWidget || !this.booted)
|
|
320
332
|
return;
|
|
333
|
+
this.updateScale();
|
|
321
334
|
var scene = this.renderWidget.switchScene(SCENE_KEY);
|
|
322
335
|
/**
|
|
323
336
|
* 更新canvas数据
|
|
@@ -336,6 +349,13 @@ var CanvasLayer = /** @class */ (function (_super) {
|
|
|
336
349
|
*/
|
|
337
350
|
var enlargeBounds = this.selectionEntityManager.getEntityEnlargeBounds(CANVAS_MIN_WIDTH, CANVAS_MIN_HEIGHT);
|
|
338
351
|
this.renderWidget.updateCanvasBounds(enlargeBounds);
|
|
352
|
+
/**
|
|
353
|
+
* 第一次加载
|
|
354
|
+
*/
|
|
355
|
+
if (this.config.loading) {
|
|
356
|
+
this.config.loading = false;
|
|
357
|
+
this.node.classList.add('ready');
|
|
358
|
+
}
|
|
339
359
|
};
|
|
340
360
|
__decorate([
|
|
341
361
|
playground_1.entity(entities_1.DocumentEntity),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAClD,uCAA4C;AAC5C,oDAAoD;AAEpD,kCAA0D;AAG1D,sCAA0C;AAC1C,uEAAoE;AACpE,uDAAyE;AAEzE,IAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,IAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,IAAM,oBAAoB,GAAG,IAAI,CAAC,CAAC,0BAA0B;AAC7D,IAAM,SAAS,GAAG,MAAM,CAAC;AAEzB;IAAiC,+BAA0B;IAA3D;QAAA,
|
|
1
|
+
{"version":3,"file":"canvas-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-layer.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.1.
|
|
3
|
+
"version": "0.1.30",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "lib/browser/index",
|
|
6
6
|
"typings": "lib/browser/index.d.ts",
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"src"
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@gedit/app-config": "^0.1.
|
|
13
|
-
"@gedit/editor": "^0.1.
|
|
14
|
-
"@gedit/playground": "^0.1.
|
|
15
|
-
"@gedit/render-engine-ide": "^0.1.
|
|
16
|
-
"@gedit/workspace-2d": "^0.1.
|
|
12
|
+
"@gedit/app-config": "^0.1.30",
|
|
13
|
+
"@gedit/editor": "^0.1.30",
|
|
14
|
+
"@gedit/playground": "^0.1.30",
|
|
15
|
+
"@gedit/render-engine-ide": "^0.1.30",
|
|
16
|
+
"@gedit/workspace-2d": "^0.1.30",
|
|
17
17
|
"json-stringify-pretty-compact": "^2.0.0"
|
|
18
18
|
},
|
|
19
19
|
"geditExtensions": [
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"nyc": {
|
|
35
35
|
"extends": "../../configs/nyc.json"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "ab0cd05649af3aaf89ff271982896bbda38f8634"
|
|
38
38
|
}
|
|
@@ -40,7 +40,11 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
40
40
|
this.listenPlaygroundEvent('mousedown', () => {
|
|
41
41
|
this.context.syncToSelectionTree(this.selectionEntityManager);
|
|
42
42
|
}, -2),
|
|
43
|
+
this.config.onConfigChanged(() => {
|
|
44
|
+
this.updateScale();
|
|
45
|
+
})
|
|
43
46
|
]);
|
|
47
|
+
this.config.loading = true;
|
|
44
48
|
}
|
|
45
49
|
|
|
46
50
|
/**
|
|
@@ -61,10 +65,6 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
61
65
|
if (visible && !this.renderWidget) {
|
|
62
66
|
this.appConfig = appConfig;
|
|
63
67
|
const element = window.document.createElement('canvas');
|
|
64
|
-
// // 分辨率
|
|
65
|
-
// domUtils.setStyle(this.node, {
|
|
66
|
-
// transform: `scale(${1 / appConfig.resolution})`
|
|
67
|
-
// });
|
|
68
68
|
this.node.appendChild(element);
|
|
69
69
|
this.selectionEntityManager = new SelectionEntityManager(
|
|
70
70
|
this.entityManager,
|
|
@@ -222,6 +222,17 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
222
222
|
get document(): Editor2dDocument | undefined {
|
|
223
223
|
return this.documentEntity.config.document;
|
|
224
224
|
}
|
|
225
|
+
updateScale(): void {
|
|
226
|
+
const appConfig = this.appConfig;
|
|
227
|
+
if (!appConfig) return;
|
|
228
|
+
// 开启缩放
|
|
229
|
+
this.config.enableZoom = true;
|
|
230
|
+
this.config.updateConfig({ resolution: appConfig.resolution });
|
|
231
|
+
// 分辨率
|
|
232
|
+
domUtils.setStyle(this.node, {
|
|
233
|
+
transform: `scale(${this.config.finalScale})`
|
|
234
|
+
});
|
|
235
|
+
}
|
|
225
236
|
draw(): void {
|
|
226
237
|
const { document, appConfig, visible = false } = this.documentEntity.config;
|
|
227
238
|
if (!this.libLoaded && !this.libLoading) {
|
|
@@ -232,6 +243,7 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
232
243
|
if (!document || !appConfig || !this.libLoaded) return;
|
|
233
244
|
this.toggleVisible(document, appConfig, visible);
|
|
234
245
|
if (!this.renderWidget || !this.booted) return;
|
|
246
|
+
this.updateScale();
|
|
235
247
|
const scene = this.renderWidget.switchScene(SCENE_KEY);
|
|
236
248
|
/**
|
|
237
249
|
* 更新canvas数据
|
|
@@ -250,5 +262,12 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
|
|
|
250
262
|
*/
|
|
251
263
|
const enlargeBounds = this.selectionEntityManager.getEntityEnlargeBounds(CANVAS_MIN_WIDTH, CANVAS_MIN_HEIGHT);
|
|
252
264
|
this.renderWidget.updateCanvasBounds(enlargeBounds);
|
|
265
|
+
/**
|
|
266
|
+
* 第一次加载
|
|
267
|
+
*/
|
|
268
|
+
if (this.config.loading) {
|
|
269
|
+
this.config.loading = false;
|
|
270
|
+
this.node.classList.add('ready');
|
|
271
|
+
}
|
|
253
272
|
}
|
|
254
273
|
}
|