@gedit/editor-2d 0.1.52 → 0.1.57
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.d.ts +6 -1
- package/lib/browser/model/editor2d.d.ts.map +1 -1
- package/lib/browser/model/editor2d.js.map +1 -1
- package/lib/browser/playground/canvas-draw.d.ts +0 -2
- package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
- package/lib/browser/playground/canvas-draw.js +39 -16
- package/lib/browser/playground/canvas-draw.js.map +1 -1
- package/lib/browser/playground/entities/editor2d-entity.d.ts +4 -2
- package/lib/browser/playground/entities/editor2d-entity.d.ts.map +1 -1
- package/lib/browser/playground/entities/editor2d-entity.js.map +1 -1
- package/lib/browser/playground/playground-context.d.ts +3 -1
- package/lib/browser/playground/playground-context.d.ts.map +1 -1
- package/lib/browser/playground/playground-context.js +5 -2
- package/lib/browser/playground/playground-context.js.map +1 -1
- package/lib/browser/playground/selection-entity-manager.d.ts.map +1 -1
- package/lib/browser/playground/selection-entity-manager.js +21 -9
- package/lib/browser/playground/selection-entity-manager.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/model/editor2d.ts +4 -1
- package/src/browser/playground/canvas-draw.ts +40 -19
- package/src/browser/playground/entities/editor2d-entity.ts +5 -2
- package/src/browser/playground/playground-context.ts +3 -1
- package/src/browser/playground/{selection-entity-manager.ts → selection-entity-manager.tsx} +22 -10
- package/src/browser/style/index.less +5 -0
- package/src/browser/svg/filter.svg +1 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
import { EditorDocumentNode } from '@gedit/editor';
|
|
2
3
|
import { ExpandableTreeNode, SelectableTreeNode, TreeNode } from '@gedit/tree';
|
|
3
4
|
import { Disposable, URI } from '@gedit/utils';
|
|
@@ -7,8 +8,9 @@ import { GameObjectBaseType, GameObjectData, GameObjectType } from '@gedit/rende
|
|
|
7
8
|
import { IDragEvent } from '@phosphor/dragdrop';
|
|
8
9
|
import { Resource } from '@gedit/resource';
|
|
9
10
|
import { WorkspaceResourceService } from '@gedit/workspace-2d';
|
|
10
|
-
import { PlaygroundConfig } from '@gedit/playground';
|
|
11
|
+
import { PlaygroundConfig, SelectorEntityRendererProps } from '@gedit/playground';
|
|
11
12
|
import type { CanvasDraw } from '../playground/canvas-draw';
|
|
13
|
+
import type { PlaygroundContext2d } from '../playground/playground-context';
|
|
12
14
|
export interface Lockable {
|
|
13
15
|
locked: boolean;
|
|
14
16
|
}
|
|
@@ -76,6 +78,9 @@ export interface Editor2dModelOptions {
|
|
|
76
78
|
autoSaveService: ResourceAutoSaveService;
|
|
77
79
|
isTemplate?: boolean;
|
|
78
80
|
playgroundConfig?: PlaygroundConfig;
|
|
81
|
+
extendEntityRenderer?: (props: SelectorEntityRendererProps & {
|
|
82
|
+
context: PlaygroundContext2d;
|
|
83
|
+
}) => JSX.Element;
|
|
79
84
|
onCanvasDataChanged?(canvas: CanvasDraw): void;
|
|
80
85
|
}
|
|
81
86
|
export declare function getEditor2dModelOpts(resource: Resource, resourceService: WorkspaceResourceService, encoding?: string): Promise<Editor2dModelOptions>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor2d.d.ts","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAa,UAAU,EAAsB,GAAG,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAA2B,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"editor2d.d.ts","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAa,UAAU,EAAsB,GAAG,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAA2B,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAI5E,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,QAAQ,EAAE,gBAAgB,CAAA;CAC3B;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB;AAGD,eAAO,MAAM,+BAA+B,UAA6B,CAAC;AAoB1E,yBAAiB,eAAe,CAAC;IAC/B,SAAgB,WAAW,CAAC,WAAW,EAAE,eAAe,GAAG,eAAe,CAQzE;IACD,SAAgB,aAAa,CAAC,WAAW,EAAE,eAAe,GAAG,MAAM,CAElE;CACF;AAED,MAAM,WAAW,YAAa,SAAQ,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,cAAc;IAC9G,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAC1C;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;QACzB,KAAK,EAAE;YAAE,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAClC,CAAA;CACF;AAED,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,kBAAkB;IAC7E,QAAQ,EAAE,CAAC,YAAY,GAAG,qBAAqB,CAAC,EAAE,CAAA;IAClD,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,yBAAiB,YAAY,CAAC;IAC5B,MAAM,CAAC,MAAM,YAAY,SAAS,CAAC;IACnC,MAAM,UAAU,YAAY,IAAI,MAAM,CAErC;IACD,MAAM,UAAU,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,qBAAqB,CAMjG;IACD,MAAM,UAAU,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,QAAQ,GAAG,MAAM,CAOzF;IACD,MAAM,UAAU,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,QAAQ,GAAG,MAAM,CAO7F;IACD,MAAM,UAAU,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,YAAY,CAMnF;IACD,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAE9D;IACD,MAAM,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,IAAI,YAAY,CAEjE;IACD,MAAM,UAAU,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE5D;IACD,MAAM,UAAU,gBAAgB,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAejF;IACD,MAAM,UAAU,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,YAAY,CAKrF;IAED;;OAEG;IACH,MAAM,UAAU,UAAU,CAAC,OAAO,mCAA4B,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,GAAE,MAAuB,GAAG,YAAY,CAWtI;IAED;;OAEG;IACH,MAAM,UAAU,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,qBAAqB,CAyB9D;IACD,UAAU,cAAc;QACtB,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;KACjD;IACD,MAAM,UAAU,qBAAqB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,UAAU,CA8BpH;;CACF;AAED,eAAO,MAAM,oBAAoB,QAA0B,CAAC;AAC5D,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,uBAAuB,CAAA;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IAEnC,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,2BAA2B,GAAG;QAAE,OAAO,EAAE,mBAAmB,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAE9G,mBAAmB,CAAC,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAC/C;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,wBAAwB,EAAE,QAAQ,GAAE,MAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAWlK"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sCAA8E;AAC9E,uDAAoH;AAEpH,sDAA0F;
|
|
1
|
+
{"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,6 @@ export declare class CanvasDraw extends DisposableImpl {
|
|
|
54
54
|
protected onDrawEmitter: Emitter<GameSceneSizeConfig>;
|
|
55
55
|
protected onLoadingEmitter: Emitter<CanvasDrawLoadingState>;
|
|
56
56
|
protected onGameObjectChangeEmitter: Emitter<GameObjectChangeEvent>;
|
|
57
|
-
protected appConfig?: GameConfig;
|
|
58
57
|
protected data?: CanvasDrawData;
|
|
59
58
|
private booted;
|
|
60
59
|
private libLoaded;
|
|
@@ -87,7 +86,6 @@ export declare class CanvasDraw extends DisposableImpl {
|
|
|
87
86
|
updateGameObjects(scene: GameSceneIDE, content: Editor2dNode): void;
|
|
88
87
|
updateGameObject(scene: GameSceneIDE, node: Editor2dNode, depth: number, renderKeys: string[], isInside?: boolean, parentId?: string): number;
|
|
89
88
|
protected fireLoading(allLoaded: boolean): void;
|
|
90
|
-
toTextureId(textureId?: string): string | undefined;
|
|
91
89
|
protected lastZoom: number;
|
|
92
90
|
protected lastResolution: number;
|
|
93
91
|
refreshScale(delayDraw?: boolean, zoom?: number, resolution?: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,6 +84,41 @@ var GameObjectEventType;
|
|
|
84
84
|
GameObjectEventType[GameObjectEventType["UPDATE"] = 2] = "UPDATE";
|
|
85
85
|
GameObjectEventType[GameObjectEventType["ERROR"] = 3] = "ERROR";
|
|
86
86
|
})(GameObjectEventType = exports.GameObjectEventType || (exports.GameObjectEventType = {}));
|
|
87
|
+
function replaceSymbolKey(originData, config, obj, path, isClone) {
|
|
88
|
+
utils_1.each(obj || originData, function (v, key) {
|
|
89
|
+
var _a;
|
|
90
|
+
var currentPath = path ? path + "." + key : key;
|
|
91
|
+
if (typeof v === 'string') {
|
|
92
|
+
var matched = v.match(/^\$\{([^}]+)\}$/);
|
|
93
|
+
// 旧的写法, TODO 暂时做兼容
|
|
94
|
+
if (!matched && key === 'textureId') {
|
|
95
|
+
matched = v.match(/^symbol\/(.+)/);
|
|
96
|
+
}
|
|
97
|
+
if (matched) {
|
|
98
|
+
if (!isClone) {
|
|
99
|
+
originData = utils_1.deepClone(originData);
|
|
100
|
+
isClone = true;
|
|
101
|
+
}
|
|
102
|
+
var symbolId_1 = matched[1];
|
|
103
|
+
var symbolValue = ((_a = config.symbols.find(function (s) { return s.id === symbolId_1; })) === null || _a === void 0 ? void 0 : _a.value) || '';
|
|
104
|
+
utils_1.setByKey(originData, currentPath, symbolValue);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else if (Array.isArray(v)) {
|
|
108
|
+
v.forEach(function (item, i) {
|
|
109
|
+
originData = replaceSymbolKey(originData, config, item, currentPath + "." + i, isClone);
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
else if (typeof v === 'object') {
|
|
113
|
+
originData = replaceSymbolKey(originData, config, v, currentPath, isClone);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
return originData;
|
|
117
|
+
}
|
|
118
|
+
function toNodeData(node, config) {
|
|
119
|
+
return replaceSymbolKey(utils_1.omit(node, ['parent', 'previousSibling', 'nextSibling', 'children']), config);
|
|
120
|
+
}
|
|
121
|
+
;
|
|
87
122
|
/**
|
|
88
123
|
* 画布绘制逻辑
|
|
89
124
|
*/
|
|
@@ -245,19 +280,20 @@ var CanvasDraw = /** @class */ (function (_super) {
|
|
|
245
280
|
var currentDepth = depth;
|
|
246
281
|
var gameObject = gameObjectCache.get(nodePath);
|
|
247
282
|
var firstCreate = false;
|
|
283
|
+
var nodeData = toNodeData(node, this.data.appConfig);
|
|
248
284
|
var newVersion = currentDepth + (node.version || 0) + ':' + (((_b = this.data) === null || _b === void 0 ? void 0 : _b.configVersion) || 0);
|
|
249
285
|
// 内部节点无法选中
|
|
250
286
|
if (!gameObject) {
|
|
251
287
|
var gameObjectChildren = children ? children.map(function (c) { return gameObjectCache.get(editor2d_1.Editor2dNode.getNodePath(c)); }) : [];
|
|
252
288
|
try {
|
|
253
|
-
gameObject = scene.createAuto(node.displayType, __assign(__assign({},
|
|
289
|
+
gameObject = scene.createAuto(node.displayType, __assign(__assign({}, nodeData), { id: nodePath, depth: currentDepth, parentId: parentId }), gameObjectChildren);
|
|
254
290
|
}
|
|
255
291
|
catch (e) {
|
|
256
292
|
console.error(e);
|
|
257
293
|
return depth;
|
|
258
294
|
}
|
|
259
295
|
// 标记并缓存当前texture
|
|
260
|
-
this.gameObjectTextureMap.set(nodePath,
|
|
296
|
+
this.gameObjectTextureMap.set(nodePath, nodeData.textureId);
|
|
261
297
|
gameObjectCache.set(nodePath, gameObject);
|
|
262
298
|
scene.onGameObjectDispose(gameObject, function () {
|
|
263
299
|
_this.gameObjectCache.delete(nodePath);
|
|
@@ -294,7 +330,6 @@ var CanvasDraw = /** @class */ (function (_super) {
|
|
|
294
330
|
firstCreate = true;
|
|
295
331
|
}
|
|
296
332
|
if (gameObject && gameObject.getTextureId) {
|
|
297
|
-
gameObject.data.textureId = this.toTextureId(node.textureId);
|
|
298
333
|
var oldTexture = this.gameObjectTextureMap.get(nodePath);
|
|
299
334
|
var newTexture = gameObject.getTextureId();
|
|
300
335
|
// 素材更新则销毁重新创建
|
|
@@ -306,7 +341,7 @@ var CanvasDraw = /** @class */ (function (_super) {
|
|
|
306
341
|
var update = function () {
|
|
307
342
|
var oldVersion = _this.nodeVersionCache.get(nodePath);
|
|
308
343
|
if (oldVersion !== newVersion) {
|
|
309
|
-
gameObject.update(__assign(__assign({},
|
|
344
|
+
gameObject.update(__assign(__assign({}, nodeData), { parentId: parentId, id: nodePath, textureId: nodeData.textureId, depth: currentDepth }));
|
|
310
345
|
_this.nodeVersionCache.set(nodePath, newVersion);
|
|
311
346
|
}
|
|
312
347
|
};
|
|
@@ -329,18 +364,6 @@ var CanvasDraw = /** @class */ (function (_super) {
|
|
|
329
364
|
currentCount: currentCount,
|
|
330
365
|
});
|
|
331
366
|
};
|
|
332
|
-
CanvasDraw.prototype.toTextureId = function (textureId) {
|
|
333
|
-
var _a, _b;
|
|
334
|
-
if (!textureId)
|
|
335
|
-
return textureId;
|
|
336
|
-
if (textureId.match(/^symbol\//)) {
|
|
337
|
-
var symbols = ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.appConfig) === null || _b === void 0 ? void 0 : _b.symbols) || [];
|
|
338
|
-
var symbolId_1 = textureId.replace(/^symbol\//, '');
|
|
339
|
-
var symbol = symbols.find(function (s) { return s.id === symbolId_1; });
|
|
340
|
-
return symbol ? symbol.value : undefined;
|
|
341
|
-
}
|
|
342
|
-
return textureId;
|
|
343
|
-
};
|
|
344
367
|
CanvasDraw.prototype.refreshScale = function (delayDraw, zoom, resolution) {
|
|
345
368
|
var _a, _b;
|
|
346
369
|
if (delayDraw === void 0) { delayDraw = true; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-draw.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAmG;AACnG,8CAAiD;AAGjD,sCAA+E;AAE/E,IAAM,oBAAoB,GAAG,KAAK,CAAC,CAAC,0BAA0B;AAC9D,IAAM,SAAS,GAAG,MAAM,CAAC;AA2BzB,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC7B,iEAAM,CAAA;IACN,mEAAO,CAAA;IACP,iEAAM,CAAA;IACN,+DAAK,CAAA;AACP,CAAC,EALW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAK9B;AAeD;;GAEG;AACH;IAAgC,8BAAc;IAuB5C,oBACY,IAAoB;QADhC,YAGE,iBAAO,SAKR;QAPW,UAAI,GAAJ,IAAI,CAAgB;QAvBtB,mBAAa,GAAG,IAAI,eAAO,EAAuB,CAAC;QACnD,sBAAgB,GAAG,IAAI,eAAO,EAA0B,CAAC;QACzD,+BAAyB,GAAG,IAAI,eAAO,EAAyB,CAAC;QAGnE,YAAM,GAAY,KAAK,CAAC;QACxB,eAAS,GAAG,KAAK,CAAC;QAClB,gBAAU,GAAG,KAAK,CAAC;QACnB,iBAAW,GAAG,KAAK,CAAC;QAEnB,qBAAe,GAA4B,IAAI,GAAG,EAAE,CAAC;QACpD,0BAAoB,GAAoC,IAAI,GAAG,EAAE,CAAC;QAClE,sBAAgB,GAAwB,IAAI,GAAG,EAAE,CAAC;QAClD,oBAAc,GAAa,EAAE,CAAC;QAIhC,cAAQ,GAAG,CAAC,CAAC,CAAC;QACb,YAAM,GAAG,KAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QAClC,eAAS,GAAG,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;QACxC,wBAAkB,GAAG,KAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QACnE,aAAO,GAAG,IAAI,CAAC;QAgOL,cAAQ,GAAG,GAAG,CAAC;QACf,oBAAc,GAAG,GAAG,CAAC;QA5N7B,KAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACrB,KAAI,CAAC,aAAa;YAClB,KAAI,CAAC,gBAAgB;SACtB,CAAC,CAAC;;IACL,CAAC;IACe,kCAAa,GAA7B;;;;4BACE,qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,EAAA;;wBAA1C,SAA0C,CAAC;wBAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBACtB,IAAI,CAAC,IAAI,EAAE,CAAC;;;;;KACb;IACD,4BAAO,GAAP;QACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD;;;;;;OAMG;IACO,kCAAa,GAAvB,UAAwB,SAAwB,EAAE,OAAgB,EAAE,UAAkB;QAAtF,iBAqDC;;QApDC,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;SAChC;QACD,sBAAsB;QACtB,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE;YAC7D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SAC7B;QACD,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACjC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YACnC,IAAM,SAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAO,CAAC,CAAC;YACpC,qCAAqC;YACrC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,wBACjE,SAAS,KACZ,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,EACT,GAAG,QAAE,IAAI,CAAC,IAAI,0CAAE,GAAG,EACnB,MAAM,EAAE,SAAO,EACf,eAAe,EAAE,SAAS,CAAC,eAAe,EAC1C,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAC9B,KAAK,EAAE,IAAI,IACX,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAU,CAAC,MAAM,CAAC;gBACjD,IAAI,KAAI,CAAC,mBAAmB,EAAE;oBAC5B,KAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;oBACnC,KAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;iBACtC;gBACD,KAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAO,CAAC,CAAC;gBACpC,KAAI,CAAC,YAAY,GAAG,SAAS,CAAC;gBAC9B,KAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACtB,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;gBAC7B,KAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,KAAI,CAAC,IAAI,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QACD,qBAAqB;QACrB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE;YACjC,IAAM,WAAS,GAAG,UAAU,CAAC;gBAC3B,IAAI,KAAI,CAAC,YAAY;oBAAE,KAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YACrD,CAAC,EAAE,oBAAoB,CAAC,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,kBAAU,CAAC,MAAM,CAAC;gBACrC,MAAM,CAAC,YAAY,CAAC,WAAS,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,OAAO,KAAK,IAAI,CAAC,WAAW,EAAE;YAChC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAAA,CAAC;IACF,sCAAiB,GAAjB,UAAkB,KAAmB,EAAE,OAAqB;QAA5D,iBAcC;QAbC,IAAM,UAAU,GAAa,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACrE,OAAO;QACP,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAA,GAAG;YAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC7B,IAAM,GAAG,GAAG,KAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,GAAG,EAAE;oBACP,GAAG,CAAC,OAAO,EAAE,CAAC;iBACf;aACF;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;IACnC,CAAC;IAED,qCAAgB,GAAhB,UAAiB,KAAmB,EAAE,IAAkB,EAAE,KAAa,EAAE,UAAoB,EAAE,QAAyB,EAAE,QAAiB;;QAA3I,iBAwGC;;QAxG8F,yBAAA,EAAA,gBAAyB;QACtH,IAAM,QAAQ,GAAG,uBAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,QAAQ,GAAG,CAAC,IAAI,CAAC,QAA0B,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QACzE,IAAM,IAAI,GAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAK,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtG,IAAM,MAAM,GAAG,CAAC,uBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7G,IAAI,UAAU,GAAG,IAAI,CAAC,CAAC,SAAS;QAChC,IAAM,UAAU,GAAY,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,uBAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;QACrH,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,MAAM,EAAE;YACV,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;YACjF,OAAO;YACP,WAAW,GAAG,IAAI,CAAC;YACnB,kBAAkB;YAClB,UAAU,GAAG,KAAK,CAAC;SACpB;QACD,SAAS;QACT,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;;gBACnC,KAAoB,IAAA,aAAA,SAAA,QAAQ,CAAA,kCAAA,wDAAE;oBAAzB,IAAM,KAAK,qBAAA;oBACd,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,IAAI,QAAQ,EAAE,QAAQ,CAAC,CAAC;iBACnG;;;;;;;;;SACF;QACD,IAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAM,YAAY,GAAG,KAAK,CAAC;QAC3B,IAAI,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAM,UAAU,GAAG,YAAY,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,OAAA,IAAI,CAAC,IAAI,0CAAE,aAAa,KAAI,CAAC,CAAC,CAAC;QAC9F,WAAW;QACX,IAAI,CAAC,UAAU,EAAE;YACf,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,eAAe,CAAC,GAAG,CAAC,uBAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAE,EAAjD,CAAiD,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChH,IAAI;gBACF,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,wBACxC,IAAI,KAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,UAAA,KAClG,kBAAkB,CACnB,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,OAAO,KAAK,CAAC;aACd;YACD,iBAAiB;YACjB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC1E,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC1C,KAAK,CAAC,mBAAmB,CAAC,UAAU,EAAE;gBACpC,KAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACtC,KAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3C,KAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACvC,KAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAW,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;YAC5G,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE;gBACnC,KAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;oBAClC,IAAI,EAAE,mBAAmB,CAAC,MAAM;oBAChC,UAAU,EAAE,UAAW;oBACvB,IAAI,MAAA;iBACL,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE;gBACnC,KAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBAChD,iBAAiB;gBACjB,KAAI,CAAC,WAAW,CAAC,uBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAA,KAAK;gBACvC,KAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;oBAClC,IAAI,EAAE,mBAAmB,CAAC,KAAK;oBAC/B,UAAU,EAAE,UAAW;oBACvB,IAAI,MAAA;oBACJ,KAAK,OAAA;iBACN,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;gBAClC,IAAI,EAAE,mBAAmB,CAAC,MAAM;gBAChC,UAAU,EAAE,UAAW;gBACvB,IAAI,MAAA;gBACJ,KAAK,EAAE,EAAE,UAAU,YAAA,EAAE,UAAU,YAAA,EAAE,QAAQ,UAAA,EAAE;aAC5C,CAAC,CAAC;YACH,WAAW,GAAG,IAAI,CAAC;SACpB;QACD,IAAI,UAAU,IAAI,UAAU,CAAC,YAAY,EAAE;YACzC,UAAU,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7D,IAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC3D,IAAM,UAAU,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;YAC7C,cAAc;YACd,IAAI,UAAU,KAAK,UAAU,EAAE;gBAC7B,UAAU,CAAC,OAAO,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;aACzF;SACF;QACD,IAAM,MAAM,GAAG;YACb,IAAM,UAAU,GAAG,KAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACvD,IAAI,UAAU,KAAK,UAAU,EAAE;gBAC7B,UAAW,CAAC,MAAM,uBACb,IAAI,KACP,QAAQ,UAAA,EACR,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAC3C,KAAK,EAAE,YAAY,IACnB,CAAC;gBACH,KAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;aACjD;QACH,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,IAAI,UAAU,CAAC,OAAO,EAAE;YACtC,MAAM,EAAE,CAAC;SACV;QACD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1B,KAAK,EAAE,CAAC;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAES,gCAAW,GAArB,UAAsB,SAAkB;QACtC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;QAChD,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;SACtB;QACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACzB,MAAM,EAAE,SAAS;YACjB,QAAQ,UAAA;YACR,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IACD,gCAAW,GAAX,UAAY,SAAkB;;QAC5B,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAC;QACjC,IAAI,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAChC,IAAM,OAAO,GAAG,aAAA,IAAI,CAAC,IAAI,0CAAE,SAAS,0CAAE,OAAO,KAAI,EAAE,CAAC;YACpD,IAAM,UAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACpD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,EAAE,KAAK,UAAQ,EAAjB,CAAiB,CAAC,CAAC;YACpD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;SAC1C;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAID,iCAAY,GAAZ,UAAa,SAAyB,EAAE,IAA4B,EAAE,UAAwC;;QAAjG,0BAAA,EAAA,gBAAyB;QAAE,qBAAA,EAAA,OAAe,IAAI,CAAC,QAAQ;QAAE,2BAAA,EAAA,aAAqB,IAAI,CAAC,cAAc;QAC5G,IAAM,OAAO,SAAG,IAAI,CAAC,IAAI,0CAAE,OAAO,CAAC;QACnC,IAAM,KAAK,SAAG,IAAI,CAAC,YAAY,0CAAE,YAAY,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;QACjC,IAAI,KAAK,EAAE;YACT,oBAAoB;YACpB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,UAAU,EAAE,SAAS,CAAC,CAAC;SACjE;IACH,CAAC;IACD,2BAAM,GAAN,UAAO,IAAoB;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACH,iCAAY,GAAZ;QACE,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QAC3B,IAAA,KAAyB,IAAI,CAAC,IAAI,EAAhC,OAAO,aAAA,EAAE,SAAS,eAAc,CAAC;QACzC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAC7C,8DAA8D;QAC9D,IAAM,UAAU,GAAI,OAAe,CAAC,kCAAkB,CAAC,KAAK,CAAoC,CAAC;QACjG,IAAM,MAAM,GAAG,0BAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChD,IAAM,MAAM,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC;QACpC,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,MAAM,CAAC,KAAK;YAChE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,KAAI,MAAM,CAAC,MAAM;SACrE,CAAC;IACJ,CAAC;IACS,yBAAI,GAAd;QACE,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO;QACjB,IAAA,KAA8C,IAAI,CAAC,IAAI,EAArD,OAAO,aAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,UAAU,gBAAc,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACvC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO;SACR;QACD,IAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI;YAAE,OAAO;QAC/D,IAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO;QAC/C,IAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;QACxF;;WAEG;QACH,IAAI,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,CAAC;QACnC;;WAEG;QACH,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvC;;WAEG;QACH,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QACrC;;WAEG;QACH,iHAAiH;QACjH,uDAAuD;QACvD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACH,iBAAC;AAAD,CAAC,AAvTD,CAAgC,sBAAc,GAuT7C;AAvTY,gCAAU"}
|
|
1
|
+
{"version":3,"file":"canvas-draw.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { SelectableEntity } from '@gedit/playground/lib/browser';
|
|
2
|
-
import { Editor2dNode } from '../../model';
|
|
3
|
-
import { GameObject, GameObjectSelectionData } from '@gedit/render-engine-ide';
|
|
2
|
+
import type { Editor2dNode } from '../../model';
|
|
3
|
+
import type { GameObject, GameObjectSelectionData } from '@gedit/render-engine-ide';
|
|
4
|
+
import type { PlaygroundContext2d } from '../playground-context';
|
|
4
5
|
export declare class Editor2dEntity extends SelectableEntity {
|
|
5
6
|
static type: string;
|
|
6
7
|
selectableInit: boolean;
|
|
7
8
|
adsorbableInit: boolean;
|
|
8
9
|
node: Editor2dNode;
|
|
10
|
+
context: PlaygroundContext2d;
|
|
9
11
|
gameObject: GameObject;
|
|
10
12
|
ignoreTransformChanged: boolean;
|
|
11
13
|
update(data: GameObjectSelectionData | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor2d-entity.d.ts","sourceRoot":"","sources":["../../../../src/browser/playground/entities/editor2d-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"editor2d-entity.d.ts","sourceRoot":"","sources":["../../../../src/browser/playground/entities/editor2d-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE,qBAAa,cAAe,SAAQ,gBAAgB;IAClD,MAAM,CAAC,IAAI,SAAoB;IAC/B,cAAc,UAAS;IACvB,cAAc,UAAS;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,sBAAsB,UAAQ;IAE9B,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,SAAS,GAAG,IAAI;CAOxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor2d-entity.js","sourceRoot":"","sources":["../../../../src/browser/playground/entities/editor2d-entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAiE;
|
|
1
|
+
{"version":3,"file":"editor2d-entity.js","sourceRoot":"","sources":["../../../../src/browser/playground/entities/editor2d-entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAiE;AAKjE,0CAA0C;AAE1C;IAAoC,kCAAgB;IAApD;QAAA,qEAgBC;QAdC,oBAAc,GAAG,KAAK,CAAC;QACvB,oBAAc,GAAG,KAAK,CAAC;QAIvB,4BAAsB,GAAG,IAAI,CAAC;;IAShC,CAAC;IARC,0CAA0C;IAC1C,+BAAM,GAAN,UAAO,IAAyC;QAC9C,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5B,oBAAoB;YACpB,gCAAgC;SACjC;IACH,CAAC;IAdM,mBAAI,GAAG,gBAAgB,CAAC;IAejC,qBAAC;CAAA,AAhBD,CAAoC,0BAAgB,GAgBnD;AAhBY,wCAAc"}
|
|
@@ -8,6 +8,7 @@ import { Editor2dDocument } from '../model/editor2d-document';
|
|
|
8
8
|
import { Editor2dSelection } from '../model/editor2d-selection';
|
|
9
9
|
import { Editor2dModelOptions, Editor2dNode } from '../model/editor2d';
|
|
10
10
|
import { SelectionService } from '@gedit/application-common';
|
|
11
|
+
import { Editor2dContextKeyService } from '../editor2d-context-key-service';
|
|
11
12
|
import type { CanvasDraw } from './canvas-draw';
|
|
12
13
|
export declare const Editor2dPlayGround: unique symbol;
|
|
13
14
|
export declare type Editor2dPlayGround = Playground;
|
|
@@ -18,7 +19,8 @@ export declare class PlaygroundContext2d {
|
|
|
18
19
|
readonly selectionService: SelectionService;
|
|
19
20
|
readonly appConfig: AppConfigService;
|
|
20
21
|
readonly options: Editor2dModelOptions;
|
|
21
|
-
|
|
22
|
+
readonly contextKeyService: Editor2dContextKeyService;
|
|
23
|
+
constructor(renderEngine: RenderEngineIDEService, document: Editor2dDocument, selection: Editor2dSelection, selectionService: SelectionService, appConfig: AppConfigService, options: Editor2dModelOptions, contextKeyService: Editor2dContextKeyService);
|
|
22
24
|
onCanvasDataChanged(drawer: CanvasDraw): void;
|
|
23
25
|
/**
|
|
24
26
|
* 刷新 tree selection
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playground-context.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/playground-context.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAY,GAAG,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAc,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"playground-context.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/playground-context.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAY,GAAG,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAc,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,oBAAY,kBAAkB,GAAG,UAAU,CAAC;AAE5C,qBACa,mBAAmB;IAEI,QAAQ,CAAC,YAAY,EAAE,sBAAsB;IACnD,QAAQ,CAAC,QAAQ,EAAE,gBAAgB;IAClC,QAAQ,CAAC,SAAS,EAAE,iBAAiB;IACtC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,SAAS,EAAE,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,yBAAyB;gBAN/C,YAAY,EAAE,sBAAsB,EAC1C,QAAQ,EAAE,gBAAgB,EACzB,SAAS,EAAE,iBAAiB,EAC7B,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,gBAAgB,EACvB,OAAO,EAAE,oBAAoB,EACxB,iBAAiB,EAAE,yBAAyB;IAK1F,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAK7C;;OAEG;IACH,mBAAmB,4CAAuB,sBAAsB,WAsB1D;IAEN,sBAAsB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAQ9D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAWhD,cAAc,IAAI,GAAG;CAGtB"}
|
|
@@ -23,10 +23,11 @@ var editor2d_document_1 = require("../model/editor2d-document");
|
|
|
23
23
|
var editor2d_selection_1 = require("../model/editor2d-selection");
|
|
24
24
|
var editor2d_1 = require("../model/editor2d");
|
|
25
25
|
var application_common_1 = require("@gedit/application-common");
|
|
26
|
+
var editor2d_context_key_service_1 = require("../editor2d-context-key-service");
|
|
26
27
|
var SelectionType = tree_1.TreeSelection.SelectionType;
|
|
27
28
|
exports.Editor2dPlayGround = Symbol('Editor2dPlayGround');
|
|
28
29
|
var PlaygroundContext2d = /** @class */ (function () {
|
|
29
|
-
function PlaygroundContext2d(renderEngine, document, selection, selectionService, appConfig, options) {
|
|
30
|
+
function PlaygroundContext2d(renderEngine, document, selection, selectionService, appConfig, options, contextKeyService) {
|
|
30
31
|
var _this = this;
|
|
31
32
|
this.renderEngine = renderEngine;
|
|
32
33
|
this.document = document;
|
|
@@ -34,6 +35,7 @@ var PlaygroundContext2d = /** @class */ (function () {
|
|
|
34
35
|
this.selectionService = selectionService;
|
|
35
36
|
this.appConfig = appConfig;
|
|
36
37
|
this.options = options;
|
|
38
|
+
this.contextKeyService = contextKeyService;
|
|
37
39
|
/**
|
|
38
40
|
* 刷新 tree selection
|
|
39
41
|
*/
|
|
@@ -95,11 +97,12 @@ var PlaygroundContext2d = /** @class */ (function () {
|
|
|
95
97
|
__param(3, inversify_1.inject(application_common_1.SelectionService)),
|
|
96
98
|
__param(4, inversify_1.inject(app_config_1.AppConfigService)),
|
|
97
99
|
__param(5, inversify_1.inject(editor2d_1.Editor2dModelOptions)),
|
|
100
|
+
__param(6, inversify_1.inject(editor2d_context_key_service_1.Editor2dContextKeyService)),
|
|
98
101
|
__metadata("design:paramtypes", [render_engine_ide_1.RenderEngineIDEService,
|
|
99
102
|
editor2d_document_1.Editor2dDocument,
|
|
100
103
|
editor2d_selection_1.Editor2dSelection,
|
|
101
104
|
application_common_1.SelectionService,
|
|
102
|
-
app_config_1.AppConfigService, Object])
|
|
105
|
+
app_config_1.AppConfigService, Object, editor2d_context_key_service_1.Editor2dContextKeyService])
|
|
103
106
|
], PlaygroundContext2d);
|
|
104
107
|
return PlaygroundContext2d;
|
|
105
108
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playground-context.js","sourceRoot":"","sources":["../../../src/browser/playground/playground-context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA+C;AAC/C,8DAAkE;AAClE,oCAAgE;AAChE,gDAAqD;AACrD,sCAA6C;AAG7C,gDAA2D;AAC3D,gEAA8D;AAC9D,kEAAgE;AAChE,8CAAuE;AACvE,gEAA6D;AAC7D,IAAO,aAAa,GAAG,oBAAa,CAAC,aAAa,CAAC;AAGtC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAK/D;IACE,6BAC2C,YAAoC,EAC1C,QAA0B,EACzB,SAA4B,EAC7B,gBAAkC,EAClC,SAA2B,EACvB,OAA6B;
|
|
1
|
+
{"version":3,"file":"playground-context.js","sourceRoot":"","sources":["../../../src/browser/playground/playground-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-entity-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.
|
|
1
|
+
{"version":3,"file":"selection-entity-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAEL,aAAa,EAGd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;GAEG;AACH,qBAAa,sBAAsB;IAG/B,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,OAAO,EAAE,mBAAmB;IACtC,SAAS,CAAC,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS;IACzD,SAAS,CAAC,SAAS,EAAE,MAAM,OAAO;IALpC,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;gBAEzD,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC/C,SAAS,EAAE,MAAM,OAAO;IAkBpC;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;IAyDhJ,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IA8B5D,mBAAmB,IAAI,cAAc,EAAE;IASvC;;OAEG;IACH,qBAAqB,6CAgBd;IACP;;OAEG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;IAStE,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;CAKlD"}
|
|
@@ -23,6 +23,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.SelectionEntityManager = void 0;
|
|
26
|
+
var React = require("react");
|
|
26
27
|
var model_1 = require("../model");
|
|
27
28
|
var editor2d_entity_1 = require("./entities/editor2d-entity");
|
|
28
29
|
var utils_1 = require("@gedit/utils");
|
|
@@ -73,13 +74,18 @@ var SelectionEntityManager = /** @class */ (function () {
|
|
|
73
74
|
}, 40);
|
|
74
75
|
var selectionConfigEntity = entityManager.getEntity(playground_1.SelectorConfigEntity);
|
|
75
76
|
selectionConfigEntity === null || selectionConfigEntity === void 0 ? void 0 : selectionConfigEntity.customSelectorEntityRenderer(function (props) {
|
|
76
|
-
var
|
|
77
|
+
var newProps = __assign({}, props);
|
|
78
|
+
var entity = newProps.entity;
|
|
79
|
+
if (_this.context.options.extendEntityRenderer) {
|
|
80
|
+
newProps.extendRenderer = function () { return _this.context.options.extendEntityRenderer(__assign(__assign({}, props), { context: _this.context })); };
|
|
81
|
+
}
|
|
77
82
|
var deco = _this.context.renderEngine.getGameObjectDecoration(entity.gameObject.scene.config.engine, entity.node.displayType);
|
|
78
83
|
// 自定义渲染器
|
|
79
84
|
if (deco.selectionRenderer) {
|
|
80
|
-
|
|
85
|
+
var Comp = deco.selectionRenderer;
|
|
86
|
+
return React.createElement(Comp, __assign({}, newProps));
|
|
81
87
|
}
|
|
82
|
-
return playground_1.DefaultSelectorEntityRenderer(
|
|
88
|
+
return playground_1.DefaultSelectorEntityRenderer(newProps);
|
|
83
89
|
});
|
|
84
90
|
}
|
|
85
91
|
/**
|
|
@@ -102,6 +108,7 @@ var SelectionEntityManager = /** @class */ (function () {
|
|
|
102
108
|
entity.mouseSelect = selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
|
|
103
109
|
entity.adsorbable = adsorbable && (deco.adsorbable === undefined ? true : deco.adsorbable);
|
|
104
110
|
entity.gameObject = gameObject;
|
|
111
|
+
entity.context = this.context;
|
|
105
112
|
entity.node = node;
|
|
106
113
|
entity.transform.sizeToScale = !!deco.sizeToScale;
|
|
107
114
|
// 切换选择框的类型，如圆形、矩形, 默认矩形
|
|
@@ -124,11 +131,17 @@ var SelectionEntityManager = /** @class */ (function () {
|
|
|
124
131
|
entity.onDispose(function () {
|
|
125
132
|
_this.nodeEntitiesCache.delete(nodePath);
|
|
126
133
|
});
|
|
127
|
-
|
|
134
|
+
var lastTransform;
|
|
135
|
+
entity.onTransformChanged(function (newTransform) {
|
|
128
136
|
var document = _this.getDocument();
|
|
129
|
-
if (!document || document.animationStarted || entity.ignoreTransformChanged)
|
|
137
|
+
if (!lastTransform || !document || document.animationStarted || entity.ignoreTransformChanged) {
|
|
138
|
+
lastTransform = newTransform;
|
|
130
139
|
return;
|
|
131
|
-
|
|
140
|
+
}
|
|
141
|
+
;
|
|
142
|
+
var delta = utils_1.TransformSchema.getDelta(lastTransform, newTransform);
|
|
143
|
+
lastTransform = newTransform;
|
|
144
|
+
document.updateNode(node, __assign(__assign({}, utils_1.TransformSchema.mergeDelta(node, delta)), { rotation: newTransform.rotation }), true);
|
|
132
145
|
});
|
|
133
146
|
// 设置控制key
|
|
134
147
|
if (deco.selectControlKeys) {
|
|
@@ -164,7 +177,7 @@ var SelectionEntityManager = /** @class */ (function () {
|
|
|
164
177
|
entity.transform.isContainer = !!deco.isContainer;
|
|
165
178
|
entity.update(register.getSelectionData(gameObject));
|
|
166
179
|
entity.ignoreTransformChanged = false;
|
|
167
|
-
var sizeVisible = !gameObject.data.canvasHide && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
|
|
180
|
+
var sizeVisible = !gameObject.data.canvasHide; // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
|
|
168
181
|
// 图层节点无法被选中
|
|
169
182
|
entity.selectable = entity.selectableInit && sizeVisible;
|
|
170
183
|
// 锁定状态的节点无法通过鼠标点击
|
|
@@ -220,8 +233,7 @@ var SelectionEntityManager = /** @class */ (function () {
|
|
|
220
233
|
return math_1.Rectangle.enlarge(rects);
|
|
221
234
|
};
|
|
222
235
|
SelectionEntityManager.prototype.isLocked = function (node) {
|
|
223
|
-
|
|
224
|
-
if (!node || this.context.options.isTemplate)
|
|
236
|
+
if (!node)
|
|
225
237
|
return false;
|
|
226
238
|
if (node.locked)
|
|
227
239
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.
|
|
1
|
+
{"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"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.57",
|
|
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.55",
|
|
13
|
+
"@gedit/editor": "^0.1.54",
|
|
14
|
+
"@gedit/playground": "^0.1.56",
|
|
15
|
+
"@gedit/render-engine-ide": "^0.1.57",
|
|
16
|
+
"@gedit/workspace-2d": "^0.1.55",
|
|
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": "2a1fbf3092d2a873e33f781977fbd170d33016e6"
|
|
38
38
|
}
|
|
@@ -7,8 +7,9 @@ import { GameObjectBaseType, GameObjectData, GameObjectType } from '@gedit/rende
|
|
|
7
7
|
import { IDragEvent } from '@phosphor/dragdrop';
|
|
8
8
|
import { Resource } from '@gedit/resource';
|
|
9
9
|
import { WorkspaceResourceService } from '@gedit/workspace-2d';
|
|
10
|
-
import { PlaygroundConfig } from '@gedit/playground';
|
|
10
|
+
import { PlaygroundConfig, SelectorEntityRendererProps } from '@gedit/playground';
|
|
11
11
|
import type { CanvasDraw } from '../playground/canvas-draw';
|
|
12
|
+
import type { PlaygroundContext2d } from '../playground/playground-context';
|
|
12
13
|
|
|
13
14
|
const stringify = require('json-stringify-pretty-compact');
|
|
14
15
|
|
|
@@ -234,6 +235,8 @@ export interface Editor2dModelOptions {
|
|
|
234
235
|
autoSaveService: ResourceAutoSaveService
|
|
235
236
|
isTemplate?: boolean // 是否为模板编辑器
|
|
236
237
|
playgroundConfig?: PlaygroundConfig
|
|
238
|
+
// 扩展选择框
|
|
239
|
+
extendEntityRenderer?: (props: SelectorEntityRendererProps & { context: PlaygroundContext2d }) => JSX.Element,
|
|
237
240
|
// 画布数据更新触发, 用于生成缩略图
|
|
238
241
|
onCanvasDataChanged?(canvas: CanvasDraw): void
|
|
239
242
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { GameConfig, GameObject, GameObjectBaseType, GameObjectError } from '@gedit/render-engine';
|
|
1
|
+
import { GameConfig, GameObject, GameObjectBaseType, GameObjectData, GameObjectError } from '@gedit/render-engine';
|
|
2
2
|
import { Editor2dNode } from '../model/editor2d';
|
|
3
3
|
import { GameSceneIDE, GameWidgetIDE, RenderEngineIDEService } from '@gedit/render-engine-ide';
|
|
4
4
|
import { AppConfigData } from '@gedit/app-config/lib/common';
|
|
5
|
-
import { Disposable, DisposableImpl, Emitter, SizeSchema } from '@gedit/utils';
|
|
5
|
+
import { Disposable, DisposableImpl, Emitter, omit, setByKey, each, SizeSchema, deepClone } from '@gedit/utils';
|
|
6
6
|
|
|
7
7
|
const WAIT_TO_DISPOSE_TIME = 30000; // 延迟删除, 这样tab在频繁切换时候不会有延迟
|
|
8
8
|
const SCENE_KEY = 'boot';
|
|
@@ -52,6 +52,39 @@ export interface CanvasDrawLoadingState {
|
|
|
52
52
|
currentCount: number,
|
|
53
53
|
loaded: boolean,
|
|
54
54
|
}
|
|
55
|
+
|
|
56
|
+
function replaceSymbolKey(originData: GameObjectData, config: AppConfigData, obj?: any, path?: string, isClone?: boolean): GameObjectData {
|
|
57
|
+
each(obj || originData, (v: any, key: string) => {
|
|
58
|
+
const currentPath = path ? `${path}.${key}` : key;
|
|
59
|
+
if (typeof v === 'string') {
|
|
60
|
+
let matched = v.match(/^\$\{([^}]+)\}$/);
|
|
61
|
+
// 旧的写法, TODO 暂时做兼容
|
|
62
|
+
if (!matched && key === 'textureId') {
|
|
63
|
+
matched = v.match(/^symbol\/(.+)/);
|
|
64
|
+
}
|
|
65
|
+
if (matched) {
|
|
66
|
+
if (!isClone) {
|
|
67
|
+
originData = deepClone(originData);
|
|
68
|
+
isClone = true;
|
|
69
|
+
}
|
|
70
|
+
const symbolId = matched[1];
|
|
71
|
+
const symbolValue = config.symbols.find(s => s.id === symbolId)?.value || '';
|
|
72
|
+
setByKey(originData, currentPath, symbolValue);
|
|
73
|
+
}
|
|
74
|
+
} else if (Array.isArray(v)) {
|
|
75
|
+
v.forEach((item, i) => {
|
|
76
|
+
originData = replaceSymbolKey(originData, config, item, `${currentPath}.${i}`, isClone);
|
|
77
|
+
});
|
|
78
|
+
} else if (typeof v === 'object') {
|
|
79
|
+
originData = replaceSymbolKey(originData, config, v, currentPath, isClone);
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
return originData;
|
|
83
|
+
}
|
|
84
|
+
function toNodeData(node: Editor2dNode, config: AppConfigData): GameObjectData {
|
|
85
|
+
return replaceSymbolKey(omit(node, ['parent', 'previousSibling', 'nextSibling', 'children']), config);
|
|
86
|
+
};
|
|
87
|
+
|
|
55
88
|
/**
|
|
56
89
|
* 画布绘制逻辑
|
|
57
90
|
*/
|
|
@@ -59,7 +92,6 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
59
92
|
protected onDrawEmitter = new Emitter<GameSceneSizeConfig>();
|
|
60
93
|
protected onLoadingEmitter = new Emitter<CanvasDrawLoadingState>();
|
|
61
94
|
protected onGameObjectChangeEmitter = new Emitter<GameObjectChangeEvent>();
|
|
62
|
-
protected appConfig?: GameConfig;
|
|
63
95
|
protected data?: CanvasDrawData;
|
|
64
96
|
private booted: boolean = false;
|
|
65
97
|
private libLoaded = false;
|
|
@@ -197,13 +229,14 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
197
229
|
const currentDepth = depth;
|
|
198
230
|
let gameObject = gameObjectCache.get(nodePath);
|
|
199
231
|
let firstCreate = false;
|
|
232
|
+
const nodeData = toNodeData(node, this.data!.appConfig!);
|
|
200
233
|
const newVersion = currentDepth + (node.version || 0) + ':' + (this.data?.configVersion || 0);
|
|
201
234
|
// 内部节点无法选中
|
|
202
235
|
if (!gameObject) {
|
|
203
236
|
const gameObjectChildren = children ? children.map(c => gameObjectCache.get(Editor2dNode.getNodePath(c))!) : [];
|
|
204
237
|
try {
|
|
205
238
|
gameObject = scene.createAuto(node.displayType,
|
|
206
|
-
{...
|
|
239
|
+
{...nodeData, id: nodePath, depth: currentDepth, parentId},
|
|
207
240
|
gameObjectChildren,
|
|
208
241
|
);
|
|
209
242
|
} catch (e) {
|
|
@@ -211,7 +244,7 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
211
244
|
return depth;
|
|
212
245
|
}
|
|
213
246
|
// 标记并缓存当前texture
|
|
214
|
-
this.gameObjectTextureMap.set(nodePath,
|
|
247
|
+
this.gameObjectTextureMap.set(nodePath, nodeData.textureId);
|
|
215
248
|
gameObjectCache.set(nodePath, gameObject);
|
|
216
249
|
scene.onGameObjectDispose(gameObject, () => {
|
|
217
250
|
this.gameObjectCache.delete(nodePath);
|
|
@@ -248,7 +281,6 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
248
281
|
firstCreate = true;
|
|
249
282
|
}
|
|
250
283
|
if (gameObject && gameObject.getTextureId) {
|
|
251
|
-
gameObject.data.textureId = this.toTextureId(node.textureId);
|
|
252
284
|
const oldTexture = this.gameObjectTextureMap.get(nodePath);
|
|
253
285
|
const newTexture = gameObject.getTextureId();
|
|
254
286
|
// 素材更新则销毁重新创建
|
|
@@ -261,10 +293,10 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
261
293
|
const oldVersion = this.nodeVersionCache.get(nodePath);
|
|
262
294
|
if (oldVersion !== newVersion) {
|
|
263
295
|
gameObject!.update({
|
|
264
|
-
...
|
|
296
|
+
...nodeData,
|
|
265
297
|
parentId,
|
|
266
298
|
id: nodePath,
|
|
267
|
-
textureId:
|
|
299
|
+
textureId: nodeData.textureId,
|
|
268
300
|
depth: currentDepth,
|
|
269
301
|
});
|
|
270
302
|
this.nodeVersionCache.set(nodePath, newVersion);
|
|
@@ -290,17 +322,6 @@ export class CanvasDraw extends DisposableImpl {
|
|
|
290
322
|
currentCount,
|
|
291
323
|
});
|
|
292
324
|
}
|
|
293
|
-
toTextureId(textureId?: string): string | undefined {
|
|
294
|
-
if (!textureId) return textureId;
|
|
295
|
-
if (textureId.match(/^symbol\//)) {
|
|
296
|
-
const symbols = this.data?.appConfig?.symbols || [];
|
|
297
|
-
const symbolId = textureId.replace(/^symbol\//, '');
|
|
298
|
-
const symbol = symbols.find(s => s.id === symbolId);
|
|
299
|
-
return symbol ? symbol.value : undefined;
|
|
300
|
-
}
|
|
301
|
-
return textureId;
|
|
302
|
-
}
|
|
303
|
-
|
|
304
325
|
protected lastZoom = 0.1;
|
|
305
326
|
protected lastResolution = 0.1;
|
|
306
327
|
refreshScale(delayDraw: boolean = true, zoom: number = this.lastZoom, resolution: number = this.lastResolution ): void {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { SelectableEntity } from '@gedit/playground/lib/browser';
|
|
2
|
-
import { Editor2dNode } from '../../model';
|
|
3
|
-
import { GameObject, GameObjectSelectionData } from '@gedit/render-engine-ide';
|
|
2
|
+
import type { Editor2dNode } from '../../model';
|
|
3
|
+
import type { GameObject, GameObjectSelectionData } from '@gedit/render-engine-ide';
|
|
4
|
+
import type { PlaygroundContext2d } from '../playground-context';
|
|
5
|
+
|
|
4
6
|
// import { Compare } from '@gedit/utils';
|
|
5
7
|
|
|
6
8
|
export class Editor2dEntity extends SelectableEntity {
|
|
@@ -8,6 +10,7 @@ export class Editor2dEntity extends SelectableEntity {
|
|
|
8
10
|
selectableInit = false;
|
|
9
11
|
adsorbableInit = false;
|
|
10
12
|
node: Editor2dNode;
|
|
13
|
+
context: PlaygroundContext2d;
|
|
11
14
|
gameObject: GameObject;
|
|
12
15
|
ignoreTransformChanged = true;
|
|
13
16
|
// private data?: GameObjectSelectionData;
|
|
@@ -10,6 +10,7 @@ import { Editor2dDocument } from '../model/editor2d-document';
|
|
|
10
10
|
import { Editor2dSelection } from '../model/editor2d-selection';
|
|
11
11
|
import { Editor2dModelOptions, Editor2dNode } from '../model/editor2d';
|
|
12
12
|
import { SelectionService } from '@gedit/application-common';
|
|
13
|
+
import { Editor2dContextKeyService } from '../editor2d-context-key-service';
|
|
13
14
|
import SelectionType = TreeSelection.SelectionType;
|
|
14
15
|
import type { CanvasDraw } from './canvas-draw';
|
|
15
16
|
|
|
@@ -25,7 +26,8 @@ export class PlaygroundContext2d {
|
|
|
25
26
|
@inject(Editor2dSelection) readonly selection: Editor2dSelection,
|
|
26
27
|
@inject(SelectionService) readonly selectionService: SelectionService,
|
|
27
28
|
@inject(AppConfigService) readonly appConfig: AppConfigService,
|
|
28
|
-
@inject(Editor2dModelOptions) readonly options: Editor2dModelOptions
|
|
29
|
+
@inject(Editor2dModelOptions) readonly options: Editor2dModelOptions,
|
|
30
|
+
@inject(Editor2dContextKeyService) readonly contextKeyService: Editor2dContextKeyService
|
|
29
31
|
) {
|
|
30
32
|
}
|
|
31
33
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
1
2
|
import { Editor2dDocument, Editor2dNode } from '../model';
|
|
2
3
|
import { Editor2dEntity } from './entities/editor2d-entity';
|
|
3
4
|
import { debounce, TransformSchema } from '@gedit/utils';
|
|
@@ -24,13 +25,18 @@ export class SelectionEntityManager {
|
|
|
24
25
|
) {
|
|
25
26
|
const selectionConfigEntity = entityManager.getEntity<SelectorConfigEntity>(SelectorConfigEntity);
|
|
26
27
|
selectionConfigEntity?.customSelectorEntityRenderer(props => {
|
|
27
|
-
const
|
|
28
|
+
const newProps = {...props};
|
|
29
|
+
const entity = newProps.entity as Editor2dEntity;
|
|
30
|
+
if (this.context.options.extendEntityRenderer) {
|
|
31
|
+
newProps.extendRenderer = () => this.context.options.extendEntityRenderer!({ ...props, context: this.context });
|
|
32
|
+
}
|
|
28
33
|
const deco = this.context.renderEngine.getGameObjectDecoration(entity.gameObject.scene.config.engine, entity.node.displayType);
|
|
29
34
|
// 自定义渲染器
|
|
30
35
|
if (deco.selectionRenderer) {
|
|
31
|
-
|
|
36
|
+
const Comp = deco.selectionRenderer;
|
|
37
|
+
return <Comp {...newProps} />;
|
|
32
38
|
}
|
|
33
|
-
return DefaultSelectorEntityRenderer(
|
|
39
|
+
return DefaultSelectorEntityRenderer(newProps);
|
|
34
40
|
});
|
|
35
41
|
}
|
|
36
42
|
/**
|
|
@@ -51,6 +57,7 @@ export class SelectionEntityManager {
|
|
|
51
57
|
entity.mouseSelect = selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
|
|
52
58
|
entity.adsorbable = adsorbable && (deco.adsorbable === undefined ? true : deco.adsorbable);
|
|
53
59
|
entity.gameObject = gameObject;
|
|
60
|
+
entity.context = this.context;
|
|
54
61
|
entity.node = node;
|
|
55
62
|
entity.transform.sizeToScale = !!deco.sizeToScale;
|
|
56
63
|
// 切换选择框的类型，如圆形、矩形, 默认矩形
|
|
@@ -73,12 +80,18 @@ export class SelectionEntityManager {
|
|
|
73
80
|
entity.onDispose(() => {
|
|
74
81
|
this.nodeEntitiesCache.delete(nodePath);
|
|
75
82
|
});
|
|
76
|
-
|
|
83
|
+
let lastTransform: TransformSchema | undefined;
|
|
84
|
+
entity.onTransformChanged((newTransform: TransformSchema) => {
|
|
77
85
|
const document = this.getDocument();
|
|
78
|
-
if (!document || document.animationStarted || entity.ignoreTransformChanged)
|
|
86
|
+
if (!lastTransform || !document || document.animationStarted || entity.ignoreTransformChanged) {
|
|
87
|
+
lastTransform = newTransform;
|
|
88
|
+
return;
|
|
89
|
+
};
|
|
90
|
+
const delta = TransformSchema.getDelta(lastTransform, newTransform);
|
|
91
|
+
lastTransform = newTransform;
|
|
79
92
|
document.updateNode(node, {
|
|
80
|
-
...
|
|
81
|
-
|
|
93
|
+
...TransformSchema.mergeDelta(node as TransformSchema, delta),
|
|
94
|
+
rotation: newTransform.rotation
|
|
82
95
|
}, true);
|
|
83
96
|
});
|
|
84
97
|
// 设置控制key
|
|
@@ -115,7 +128,7 @@ export class SelectionEntityManager {
|
|
|
115
128
|
entity.transform.isContainer = !!deco.isContainer;
|
|
116
129
|
entity.update(register.getSelectionData(gameObject));
|
|
117
130
|
entity.ignoreTransformChanged = false;
|
|
118
|
-
const sizeVisible = !gameObject.data.canvasHide && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
|
|
131
|
+
const sizeVisible = !gameObject.data.canvasHide; // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
|
|
119
132
|
// 图层节点无法被选中
|
|
120
133
|
entity.selectable = entity.selectableInit && sizeVisible;
|
|
121
134
|
// 锁定状态的节点无法通过鼠标点击
|
|
@@ -169,8 +182,7 @@ export class SelectionEntityManager {
|
|
|
169
182
|
return Rectangle.enlarge(rects);
|
|
170
183
|
}
|
|
171
184
|
isLocked(node: Editor2dNode | undefined): boolean {
|
|
172
|
-
|
|
173
|
-
if (!node || this.context.options.isTemplate) return false;
|
|
185
|
+
if (!node) return false;
|
|
174
186
|
if (node.locked) return true;
|
|
175
187
|
return this.isLocked(node.parent as Editor2dNode | undefined);
|
|
176
188
|
}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
--g-icon-2d-fullscreen: url('../svg/fullscreen.svg');
|
|
8
8
|
--g-icon-2d-zoomin: url('../svg/zoomin.svg');
|
|
9
9
|
--g-icon-2d-zoomout: url('../svg/zoomout.svg');
|
|
10
|
+
--g-icon-2d-filter: url('../svg/filter.svg');
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
.engine2d-icon {
|
|
@@ -40,6 +41,10 @@
|
|
|
40
41
|
-webkit-mask: var(--g-icon-2d-zoomout);
|
|
41
42
|
mask: var(--g-icon-2d-zoomout);
|
|
42
43
|
}
|
|
44
|
+
.engine2d-filter-icon {
|
|
45
|
+
-webkit-mask: var(--g-icon-2d-filter);
|
|
46
|
+
mask: var(--g-icon-2d-filter);
|
|
47
|
+
}
|
|
43
48
|
.engine2d-toolbar-icon {
|
|
44
49
|
display: inline-block;
|
|
45
50
|
width: 16px !important;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg t="1638456119704" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3811" width="16" height="16"><path d="M741.248 79.68l-234.112 350.08v551.488l55.296 24.704v-555.776l249.152-372.544c8.064-32.96-10.496-59.712-41.152-59.712h-709.248c-30.464 0-49.28 26.752-41.344 59.712l265.728 372.544v432.256l55.36 24.704v-478.592l-248.896-348.864h649.216z m-68.032 339.648c0-16.832 12.096-30.592 27.264-30.848h277.888c15.232 0 27.712 13.824 27.712 30.848s-12.416 30.848-27.712 30.848h-277.888c-15.168-0.32-27.264-14.016-27.264-30.848z m0 185.216c0-16.832 12.096-30.592 27.264-30.848h277.888c15.232 0 27.712 13.824 27.712 30.848s-12.416 30.848-27.712 30.848h-277.888c-15.168-0.256-27.264-14.016-27.264-30.848z m0 185.28c0-16.832 12.096-30.592 27.264-30.848h277.888c15.232 0 27.712 13.824 27.712 30.848s-12.416 30.848-27.712 30.848h-277.888c-15.168-0.32-27.264-13.952-27.264-30.848z" p-id="3812"></path></svg>
|