@gedit/editor-2d 0.3.5 → 0.3.7
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/editor2d-anim-path-selection-service.d.ts +24 -0
- package/lib/browser/editor2d-anim-path-selection-service.d.ts.map +1 -0
- package/lib/browser/editor2d-anim-path-selection-service.js +52 -0
- package/lib/browser/editor2d-anim-path-selection-service.js.map +1 -0
- package/lib/browser/editor2d-context-key-service.js +7 -10
- package/lib/browser/editor2d-context-key-service.js.map +1 -1
- package/lib/browser/editor2d-contribution.js +25 -28
- package/lib/browser/editor2d-contribution.js.map +1 -1
- package/lib/browser/editor2d-frontend-module.d.ts.map +1 -1
- package/lib/browser/editor2d-frontend-module.js +38 -38
- package/lib/browser/editor2d-frontend-module.js.map +1 -1
- package/lib/browser/editor2d-label-provider.js +18 -21
- package/lib/browser/editor2d-label-provider.js.map +1 -1
- package/lib/browser/editor2d-model-provider.js +16 -19
- package/lib/browser/editor2d-model-provider.js.map +1 -1
- package/lib/browser/editor2d-ref-provider-contribution.js +13 -16
- package/lib/browser/editor2d-ref-provider-contribution.js.map +1 -1
- package/lib/browser/editor2d-service.d.ts +2 -0
- package/lib/browser/editor2d-service.d.ts.map +1 -1
- package/lib/browser/editor2d-service.js +28 -27
- package/lib/browser/editor2d-service.js.map +1 -1
- package/lib/browser/index.d.ts +2 -0
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +6 -20
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/model/editor2d-document.d.ts +22 -9
- package/lib/browser/model/editor2d-document.d.ts.map +1 -1
- package/lib/browser/model/editor2d-document.js +248 -133
- package/lib/browser/model/editor2d-document.js.map +1 -1
- package/lib/browser/model/editor2d-iterator.js +1 -5
- package/lib/browser/model/editor2d-iterator.js.map +1 -1
- package/lib/browser/model/editor2d-model-container.js +22 -26
- package/lib/browser/model/editor2d-model-container.js.map +1 -1
- package/lib/browser/model/editor2d-model.js +21 -24
- package/lib/browser/model/editor2d-model.js.map +1 -1
- package/lib/browser/model/editor2d-selection.js +7 -10
- package/lib/browser/model/editor2d-selection.js.map +1 -1
- package/lib/browser/model/editor2d-widget.js +17 -20
- package/lib/browser/model/editor2d-widget.js.map +1 -1
- package/lib/browser/model/editor2d.d.ts.map +1 -1
- package/lib/browser/model/editor2d.js +37 -35
- package/lib/browser/model/editor2d.js.map +1 -1
- package/lib/browser/model/index.js +7 -23
- package/lib/browser/model/index.js.map +1 -1
- package/lib/browser/model/utils/anim.utils.d.ts +2 -1
- package/lib/browser/model/utils/anim.utils.d.ts.map +1 -1
- package/lib/browser/model/utils/anim.utils.js +14 -16
- package/lib/browser/model/utils/anim.utils.js.map +1 -1
- package/lib/browser/model/utils/index.js +1 -17
- package/lib/browser/model/utils/index.js.map +1 -1
- package/lib/browser/playground/anim-path-edit-layer.d.ts +33 -0
- package/lib/browser/playground/anim-path-edit-layer.d.ts.map +1 -0
- package/lib/browser/playground/anim-path-edit-layer.js +352 -0
- package/lib/browser/playground/anim-path-edit-layer.js.map +1 -0
- package/lib/browser/playground/canvas-draw.d.ts +3 -0
- package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
- package/lib/browser/playground/canvas-draw.js +57 -39
- 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 +29 -32
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/lib/browser/playground/entities/document-entity.js +2 -6
- package/lib/browser/playground/entities/document-entity.js.map +1 -1
- package/lib/browser/playground/entities/editor2d-entity.js +3 -7
- package/lib/browser/playground/entities/editor2d-entity.js.map +1 -1
- package/lib/browser/playground/entities/extend-entity.js +2 -6
- package/lib/browser/playground/entities/extend-entity.js.map +1 -1
- package/lib/browser/playground/entities/index.js +3 -19
- package/lib/browser/playground/entities/index.js.map +1 -1
- package/lib/browser/playground/extend-edit/gradient-conic-node.d.ts +4 -0
- package/lib/browser/playground/extend-edit/gradient-conic-node.d.ts.map +1 -0
- package/lib/browser/playground/extend-edit/gradient-conic-node.js +69 -0
- package/lib/browser/playground/extend-edit/gradient-conic-node.js.map +1 -0
- package/lib/browser/playground/{extend-edit-layer-point-event.d.ts → extend-edit/gradient-edit-layer-point-event.d.ts} +1 -1
- package/lib/browser/playground/extend-edit/gradient-edit-layer-point-event.d.ts.map +1 -0
- package/lib/browser/playground/{extend-edit-layer-point-event.js → extend-edit/gradient-edit-layer-point-event.js} +3 -28
- package/lib/browser/playground/extend-edit/gradient-edit-layer-point-event.js.map +1 -0
- package/lib/browser/playground/extend-edit/gradient-node.d.ts +13 -0
- package/lib/browser/playground/extend-edit/gradient-node.d.ts.map +1 -0
- package/lib/browser/playground/extend-edit/gradient-node.js +154 -0
- package/lib/browser/playground/extend-edit/gradient-node.js.map +1 -0
- package/lib/browser/playground/extend-edit-layer.d.ts +0 -8
- package/lib/browser/playground/extend-edit-layer.d.ts.map +1 -1
- package/lib/browser/playground/extend-edit-layer.js +30 -249
- package/lib/browser/playground/extend-edit-layer.js.map +1 -1
- package/lib/browser/playground/index.js +11 -30
- package/lib/browser/playground/index.js.map +1 -1
- package/lib/browser/playground/path-edit/anim-path-edit-svg.d.ts +17 -0
- package/lib/browser/playground/path-edit/anim-path-edit-svg.d.ts.map +1 -0
- package/lib/browser/playground/path-edit/anim-path-edit-svg.js +58 -0
- package/lib/browser/playground/path-edit/anim-path-edit-svg.js.map +1 -0
- package/lib/browser/playground/path-edit/index.js +3 -19
- package/lib/browser/playground/path-edit/index.js.map +1 -1
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.d.ts +1 -1
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.d.ts.map +1 -1
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.js +9 -39
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.js.map +1 -1
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.d.ts +2 -6
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.d.ts.map +1 -1
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.js +20 -50
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.js.map +1 -1
- package/lib/browser/playground/path-edit/utils.js +64 -100
- package/lib/browser/playground/path-edit/utils.js.map +1 -1
- package/lib/browser/playground/path-edit-layer.d.ts.map +1 -1
- package/lib/browser/playground/path-edit-layer.js +67 -95
- package/lib/browser/playground/path-edit-layer.js.map +1 -1
- package/lib/browser/playground/playground-context.d.ts +3 -3
- package/lib/browser/playground/playground-context.d.ts.map +1 -1
- package/lib/browser/playground/playground-context.js +48 -54
- package/lib/browser/playground/playground-context.js.map +1 -1
- package/lib/browser/playground/playground-contribution.d.ts.map +1 -1
- package/lib/browser/playground/playground-contribution.js +41 -42
- package/lib/browser/playground/playground-contribution.js.map +1 -1
- package/lib/browser/playground/selection-entity-manager.d.ts.map +1 -1
- package/lib/browser/playground/selection-entity-manager.js +26 -54
- package/lib/browser/playground/selection-entity-manager.js.map +1 -1
- package/lib/browser/playground/selector-extend-icons.js +12 -39
- package/lib/browser/playground/selector-extend-icons.js.map +1 -1
- package/lib/browser/playground/selector-extend-renderer.js +22 -52
- package/lib/browser/playground/selector-extend-renderer.js.map +1 -1
- package/lib/browser/utils/bezier.path.utils.d.ts +23 -0
- package/lib/browser/utils/bezier.path.utils.d.ts.map +1 -0
- package/lib/browser/utils/bezier.path.utils.js +64 -0
- package/lib/browser/utils/bezier.path.utils.js.map +1 -0
- package/lib/browser/utils/bounds.js +17 -21
- package/lib/browser/utils/bounds.js.map +1 -1
- package/lib/browser/utils/snapshot.js +17 -20
- package/lib/browser/utils/snapshot.js.map +1 -1
- package/lib/i18n/zh-CN.js +1 -3
- package/lib/i18n/zh-CN.js.map +1 -1
- package/package.json +10 -9
- package/src/browser/editor2d-anim-path-selection-service.ts +48 -0
- package/src/browser/editor2d-frontend-module.ts +2 -0
- package/src/browser/editor2d-service.ts +2 -0
- package/src/browser/index.ts +2 -1
- package/src/browser/model/editor2d-document.ts +198 -20
- package/src/browser/model/editor2d.ts +13 -2
- package/src/browser/model/utils/anim.utils.ts +10 -6
- package/src/browser/playground/anim-path-edit-layer.tsx +435 -0
- package/src/browser/playground/canvas-draw.ts +37 -2
- package/src/browser/playground/canvas-layer.ts +1 -0
- package/src/browser/playground/extend-edit/gradient-conic-node.tsx +106 -0
- package/src/browser/playground/extend-edit/gradient-node.tsx +232 -0
- package/src/browser/playground/extend-edit-layer.tsx +32 -312
- package/src/browser/playground/path-edit/anim-path-edit-svg.tsx +168 -0
- package/src/browser/playground/path-edit/path-edit-layer-move-point.tsx +1 -1
- package/src/browser/playground/path-edit/path-edit-layer-svg-path.tsx +3 -7
- package/src/browser/playground/path-edit/utils.tsx +1 -1
- package/src/browser/playground/path-edit-layer.tsx +4 -4
- package/src/browser/playground/playground-context.ts +2 -6
- package/src/browser/playground/playground-contribution.ts +2 -0
- package/src/browser/playground/selection-entity-manager.tsx +7 -7
- package/src/browser/style/path-edit-layer.less +13 -5
- package/src/browser/utils/bezier.path.utils.ts +89 -0
- package/lib/browser/playground/extend-edit-layer-point-event.d.ts.map +0 -1
- package/lib/browser/playground/extend-edit-layer-point-event.js.map +0 -1
- /package/src/browser/playground/{extend-edit-layer-point-event.tsx → extend-edit/gradient-edit-layer-point-event.tsx} +0 -0
|
@@ -0,0 +1,352 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import * as React from 'react';
|
|
11
|
+
import { able, EditorStateConfigEntity, entity, Layer, Selectable, SelectState, EditorState, } from '@gedit/playground';
|
|
12
|
+
import { domUtils } from '@gedit/utils/lib/browser';
|
|
13
|
+
import { DocumentEntity, ExtendEntity } from './entities';
|
|
14
|
+
import { AnimSvgPath } from './path-edit/anim-path-edit-svg';
|
|
15
|
+
import { setBezierMovePoint } from './path-edit';
|
|
16
|
+
import { getPointsToPath, toFixedValue } from '@gedit/canvas-draw';
|
|
17
|
+
import TweenOne from 'tween-one';
|
|
18
|
+
const fixPointPosition = ({ item, frameData, path, key, }) => {
|
|
19
|
+
var _a, _b, _c;
|
|
20
|
+
const currentTime = typeof item.id === 'string' ? parseFloat(item.id) : item.id;
|
|
21
|
+
const preFrame = frameData
|
|
22
|
+
.filter(d => d.time < currentTime && d.key === `position.${key}`)
|
|
23
|
+
.pop();
|
|
24
|
+
const pre = path.find(d => d.id === (preFrame === null || preFrame === void 0 ? void 0 : preFrame.time));
|
|
25
|
+
const nextFrame = frameData
|
|
26
|
+
.filter(d => d.time > currentTime && d.key === `position.${key}`)
|
|
27
|
+
.shift();
|
|
28
|
+
const next = path.find(d => d.id === (nextFrame === null || nextFrame === void 0 ? void 0 : nextFrame.time));
|
|
29
|
+
if (!preFrame || !nextFrame || !pre || !next) {
|
|
30
|
+
return {
|
|
31
|
+
[key]: (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.y) !== null && _a !== void 0 ? _a : pre === null || pre === void 0 ? void 0 : pre.y) !== null && _b !== void 0 ? _b : next === null || next === void 0 ? void 0 : next.y) !== null && _c !== void 0 ? _c : 0,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
const time = nextFrame.time - preFrame.time;
|
|
35
|
+
const moment = currentTime - preFrame.time;
|
|
36
|
+
const p = getPointsToPath([pre, next]);
|
|
37
|
+
const obj = {};
|
|
38
|
+
TweenOne(obj, {
|
|
39
|
+
animation: {
|
|
40
|
+
PathMotion: { path: p },
|
|
41
|
+
duration: time,
|
|
42
|
+
},
|
|
43
|
+
moment,
|
|
44
|
+
paused: true,
|
|
45
|
+
});
|
|
46
|
+
// item.y = obj.y;
|
|
47
|
+
return obj;
|
|
48
|
+
};
|
|
49
|
+
/**
|
|
50
|
+
* 扩展编辑
|
|
51
|
+
*/
|
|
52
|
+
export class AnimPathEditLayer extends Layer {
|
|
53
|
+
constructor() {
|
|
54
|
+
super(...arguments);
|
|
55
|
+
this.node = domUtils.createDivWithClass('gedit-anim-path-edit-layer');
|
|
56
|
+
this.id = 'animPathEditLayer';
|
|
57
|
+
}
|
|
58
|
+
get document() {
|
|
59
|
+
return this.documentEntity.config.document;
|
|
60
|
+
}
|
|
61
|
+
get selectedEntity() {
|
|
62
|
+
const nodes = this.selectableNodes.filter(node => { var _a; return (_a = node.getData(SelectState)) === null || _a === void 0 ? void 0 : _a.selected; });
|
|
63
|
+
// 只考虑单选模式
|
|
64
|
+
return nodes.length === 1 ? nodes[0] : undefined;
|
|
65
|
+
}
|
|
66
|
+
get isEnabled() {
|
|
67
|
+
return this.editorState.is(EditorState.STATE_SELECT.id);
|
|
68
|
+
}
|
|
69
|
+
addDispose(disposable) {
|
|
70
|
+
this.toDispose.pushAll(disposable);
|
|
71
|
+
}
|
|
72
|
+
onReady() {
|
|
73
|
+
this.addDispose([
|
|
74
|
+
this.editorState.onStateChange(() => {
|
|
75
|
+
var _a, _b, _c, _d;
|
|
76
|
+
const animId = (_c = (_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.currentTimelineData) === null || _c === void 0 ? void 0 : _c.id;
|
|
77
|
+
// 如果动画面板打开,状态变更,清空选中
|
|
78
|
+
if (!this.isEnabled && animId) {
|
|
79
|
+
(_d = this.context.animPathSelection) === null || _d === void 0 ? void 0 : _d.clearSelection();
|
|
80
|
+
}
|
|
81
|
+
}),
|
|
82
|
+
// this.selectionService!.onSelectionChanged(e => {
|
|
83
|
+
// }),
|
|
84
|
+
this.context.animPathSelection.onSelectionChanged(() => {
|
|
85
|
+
this.draw();
|
|
86
|
+
}),
|
|
87
|
+
]);
|
|
88
|
+
}
|
|
89
|
+
onZoom(scale) {
|
|
90
|
+
domUtils.setStyle(this.node, {
|
|
91
|
+
transform: `scale(${scale})`,
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
getCurrentFrameData(id, animData) {
|
|
95
|
+
const node = this.selectedEntity;
|
|
96
|
+
if (!node || !animData) {
|
|
97
|
+
return {};
|
|
98
|
+
}
|
|
99
|
+
const frameNode = animData.frames.find((c) => { var _a; return c.id === ((_a = node === null || node === void 0 ? void 0 : node.node) === null || _a === void 0 ? void 0 : _a.id); });
|
|
100
|
+
const currentFrame = frameNode === null || frameNode === void 0 ? void 0 : frameNode.frame.value.filter((c) => c.time === id);
|
|
101
|
+
return {
|
|
102
|
+
currentFrame,
|
|
103
|
+
frameNode,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
onPointMouseDown(e, currentPoint
|
|
107
|
+
// paths: PathChild[]
|
|
108
|
+
) {
|
|
109
|
+
var _a, _b;
|
|
110
|
+
if (e.buttons !== 1) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
// 如果在 selection 里拖动所有点, 没有则切换当前 selection 里的点
|
|
114
|
+
const { animPathSelection } = this.context;
|
|
115
|
+
const animData = (_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.currentTimelineData;
|
|
116
|
+
if (!animPathSelection || !animData || !currentPoint.id) {
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
const selectionNode = [
|
|
120
|
+
{
|
|
121
|
+
pointId: currentPoint.id,
|
|
122
|
+
},
|
|
123
|
+
];
|
|
124
|
+
animPathSelection.selection = selectionNode;
|
|
125
|
+
const { currentFrame, frameNode } = this.getCurrentFrameData(currentPoint.id, animData);
|
|
126
|
+
const timeObj = {
|
|
127
|
+
totalTime: animData.totalTime,
|
|
128
|
+
regionStartTime: animData.regionStartTime,
|
|
129
|
+
regionEndTime: animData.regionEndTime,
|
|
130
|
+
};
|
|
131
|
+
if (!currentFrame || !frameNode) {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
this.startDrag(e.clientX, e.clientY, {
|
|
135
|
+
// 拖动
|
|
136
|
+
onDrag: dragEvent => {
|
|
137
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
138
|
+
let { x, y } = dragEvent.endPos;
|
|
139
|
+
x /= ((_a = this.config) === null || _a === void 0 ? void 0 : _a.finalScale) || 1;
|
|
140
|
+
y /= ((_b = this.config) === null || _b === void 0 ? void 0 : _b.finalScale) || 1;
|
|
141
|
+
if (currentFrame.length === 1) {
|
|
142
|
+
const c = currentFrame[0];
|
|
143
|
+
const v = {
|
|
144
|
+
key: `position.${c.key === 'position.x' ? 'y' : 'x'}`,
|
|
145
|
+
time: currentPoint.id,
|
|
146
|
+
value: 0, // 这里只是占位,下面会改数据;
|
|
147
|
+
};
|
|
148
|
+
const index = frameNode.frame.value.findIndex(d => d === c);
|
|
149
|
+
frameNode.frame.value.splice(index, 0, v);
|
|
150
|
+
(_d = (_c = this.document) === null || _c === void 0 ? void 0 : _c.timelineService) === null || _d === void 0 ? void 0 : _d.saveTimelineData(animData, timeObj, true);
|
|
151
|
+
const node = (_e = this.document) === null || _e === void 0 ? void 0 : _e.getNodeById(animData.id);
|
|
152
|
+
// 更新时间轴上的帧数据;
|
|
153
|
+
if (node) {
|
|
154
|
+
(_g = (_f = this.document) === null || _f === void 0 ? void 0 : _f.timelineService) === null || _g === void 0 ? void 0 : _g.changeTimelineData(node);
|
|
155
|
+
}
|
|
156
|
+
currentFrame.push(v);
|
|
157
|
+
}
|
|
158
|
+
currentFrame.forEach((c) => {
|
|
159
|
+
const keys = c.key.split('.');
|
|
160
|
+
const key = keys[1];
|
|
161
|
+
const value = toFixedValue(key === 'x' ? x : y, 4);
|
|
162
|
+
const diff = currentPoint[key] - value;
|
|
163
|
+
c.value = value;
|
|
164
|
+
if ('bezierSV' in c) {
|
|
165
|
+
c.bezierSV = (currentPoint[`${key}1`] || 0) - diff;
|
|
166
|
+
}
|
|
167
|
+
if ('bezierEV' in c) {
|
|
168
|
+
c.bezierEV = (currentPoint[`${key}2`] || 0) - diff;
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
// 更新当前帧数据
|
|
172
|
+
frameNode.frame.current =
|
|
173
|
+
((_j = (_h = this.document) === null || _h === void 0 ? void 0 : _h.timelineService) === null || _j === void 0 ? void 0 : _j.getNodeCurrentFrame(frameNode)) ||
|
|
174
|
+
frameNode.frame.current;
|
|
175
|
+
(_l = (_k = this.document) === null || _k === void 0 ? void 0 : _k.timelineService) === null || _l === void 0 ? void 0 : _l.saveTimelineData(animData, timeObj, true, true);
|
|
176
|
+
// this.document?.updateNode(animNode, { ...animNode }, true);
|
|
177
|
+
},
|
|
178
|
+
onDragEnd: () => {
|
|
179
|
+
var _a, _b;
|
|
180
|
+
(_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.saveTimelineData(animData, timeObj, true);
|
|
181
|
+
},
|
|
182
|
+
});
|
|
183
|
+
this.draw();
|
|
184
|
+
}
|
|
185
|
+
onBezierPointMouseDown(e, currentPoint, key) {
|
|
186
|
+
var _a, _b;
|
|
187
|
+
if (e.buttons !== 1) {
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
// 如果在 selection 里拖动所有点, 没有则切换当前 selection 里的点
|
|
191
|
+
const { animPathSelection } = this.context;
|
|
192
|
+
const animData = (_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.currentTimelineData;
|
|
193
|
+
if (!animPathSelection || !animData || !currentPoint.id) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const selectionNode = [
|
|
197
|
+
{
|
|
198
|
+
pointId: currentPoint.id,
|
|
199
|
+
bezierKey: key,
|
|
200
|
+
},
|
|
201
|
+
];
|
|
202
|
+
animPathSelection.selection = selectionNode;
|
|
203
|
+
const { currentFrame, frameNode } = this.getCurrentFrameData(currentPoint.id, animData);
|
|
204
|
+
const timeObj = {
|
|
205
|
+
totalTime: animData.totalTime,
|
|
206
|
+
regionStartTime: animData.regionStartTime,
|
|
207
|
+
regionEndTime: animData.regionEndTime,
|
|
208
|
+
};
|
|
209
|
+
if (!currentFrame || !frameNode) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
this.startDrag(e.clientX, e.clientY, {
|
|
213
|
+
onDrag: dragEvent => {
|
|
214
|
+
var _a, _b, _c, _d, _e, _f;
|
|
215
|
+
let { x, y } = dragEvent.endPos;
|
|
216
|
+
x /= ((_a = this.config) === null || _a === void 0 ? void 0 : _a.finalScale) || 1;
|
|
217
|
+
y /= ((_b = this.config) === null || _b === void 0 ? void 0 : _b.finalScale) || 1;
|
|
218
|
+
const p = setBezierMovePoint(currentPoint, key, {
|
|
219
|
+
x,
|
|
220
|
+
y,
|
|
221
|
+
});
|
|
222
|
+
currentFrame.forEach((c) => {
|
|
223
|
+
const keys = c.key.split('.');
|
|
224
|
+
const bezierKey = keys[1];
|
|
225
|
+
switch (bezierKey) {
|
|
226
|
+
case 'x':
|
|
227
|
+
c.bezierSV = p.x1;
|
|
228
|
+
c.bezierEV = p.x2;
|
|
229
|
+
break;
|
|
230
|
+
case 'y':
|
|
231
|
+
c.bezierSV = p.y1;
|
|
232
|
+
c.bezierEV = p.y2;
|
|
233
|
+
break;
|
|
234
|
+
default:
|
|
235
|
+
break;
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
// 更新当前帧数据
|
|
239
|
+
frameNode.frame.current =
|
|
240
|
+
((_d = (_c = this.document) === null || _c === void 0 ? void 0 : _c.timelineService) === null || _d === void 0 ? void 0 : _d.getNodeCurrentFrame(frameNode)) ||
|
|
241
|
+
frameNode.frame.current;
|
|
242
|
+
(_f = (_e = this.document) === null || _e === void 0 ? void 0 : _e.timelineService) === null || _f === void 0 ? void 0 : _f.saveTimelineData({
|
|
243
|
+
id: animData.id,
|
|
244
|
+
frames: animData.frames,
|
|
245
|
+
}, timeObj, true, true);
|
|
246
|
+
// this.document?.updateNode(animNode, { ...animNode }, true);
|
|
247
|
+
},
|
|
248
|
+
onDragEnd: () => {
|
|
249
|
+
var _a, _b;
|
|
250
|
+
animPathSelection.selection = [
|
|
251
|
+
{
|
|
252
|
+
pointId: currentPoint.id,
|
|
253
|
+
},
|
|
254
|
+
];
|
|
255
|
+
(_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.saveTimelineData({
|
|
256
|
+
id: animData.id,
|
|
257
|
+
frames: animData.frames,
|
|
258
|
+
}, timeObj);
|
|
259
|
+
},
|
|
260
|
+
});
|
|
261
|
+
this.draw();
|
|
262
|
+
}
|
|
263
|
+
draw() {
|
|
264
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
265
|
+
const node = this.selectedEntity;
|
|
266
|
+
const animId = (_c = (_b = (_a = this.document) === null || _a === void 0 ? void 0 : _a.timelineService) === null || _b === void 0 ? void 0 : _b.currentTimelineData) === null || _c === void 0 ? void 0 : _c.id;
|
|
267
|
+
if (!this.document ||
|
|
268
|
+
!node ||
|
|
269
|
+
!(animId && ((_d = node.node) === null || _d === void 0 ? void 0 : _d.useAnimationId) === animId) ||
|
|
270
|
+
!this.isEnabled) {
|
|
271
|
+
return React.createElement(React.Fragment, null);
|
|
272
|
+
}
|
|
273
|
+
// const { currentTime = 0 } = this.document.timelineService || {};
|
|
274
|
+
const animNode = this.document.getNodeById(animId);
|
|
275
|
+
const currentNode = node.node;
|
|
276
|
+
// 判断是否有 position 属性动画;
|
|
277
|
+
const frameNode = animNode.animation.frames.find((c) => c.id === currentNode.id);
|
|
278
|
+
const { frame, attrSplit = [] } = frameNode;
|
|
279
|
+
const frameData = frame.value.filter((c) => c.key.match(/^position/));
|
|
280
|
+
let path = [];
|
|
281
|
+
frameData.forEach((c) => {
|
|
282
|
+
const inPath = path.find(d => d.id === c.time);
|
|
283
|
+
const item = inPath || { id: c.time };
|
|
284
|
+
const keys = c.key.split('.');
|
|
285
|
+
const key = keys[1];
|
|
286
|
+
item[key] = c.value;
|
|
287
|
+
if ('bezierSV' in c) {
|
|
288
|
+
item[`${key}1`] = c.bezierSV;
|
|
289
|
+
}
|
|
290
|
+
if ('bezierEV' in c) {
|
|
291
|
+
item[`${key}2`] = c.bezierEV;
|
|
292
|
+
}
|
|
293
|
+
if ('pathFuncType' in c) {
|
|
294
|
+
item.type = c.pathFuncType;
|
|
295
|
+
}
|
|
296
|
+
if (!inPath) {
|
|
297
|
+
path.push(item);
|
|
298
|
+
}
|
|
299
|
+
});
|
|
300
|
+
// 保证有值,如果当前帧没有值,取前后两帧的中间值
|
|
301
|
+
path = path.map((c, index) => {
|
|
302
|
+
if ('x' in c && 'y' in c) {
|
|
303
|
+
return c;
|
|
304
|
+
}
|
|
305
|
+
const item = c;
|
|
306
|
+
if (!item.id) {
|
|
307
|
+
return Object.assign(Object.assign({}, item), { x: item.x || 0, y: item.y || 0 });
|
|
308
|
+
}
|
|
309
|
+
// 计算百分比
|
|
310
|
+
if (!('y' in c) && item.id) {
|
|
311
|
+
const { y } = fixPointPosition({
|
|
312
|
+
item: item,
|
|
313
|
+
frameData,
|
|
314
|
+
path,
|
|
315
|
+
key: 'y',
|
|
316
|
+
});
|
|
317
|
+
item.y = y;
|
|
318
|
+
return item;
|
|
319
|
+
}
|
|
320
|
+
const { x } = fixPointPosition({
|
|
321
|
+
item: item,
|
|
322
|
+
frameData,
|
|
323
|
+
path,
|
|
324
|
+
key: 'x',
|
|
325
|
+
});
|
|
326
|
+
item.x = x;
|
|
327
|
+
return item;
|
|
328
|
+
});
|
|
329
|
+
return (React.createElement(AnimSvgPath, { width: ((_e = this.config.config.pageBounds) === null || _e === void 0 ? void 0 : _e.width) || 300, height: ((_f = this.config.config.pageBounds) === null || _f === void 0 ? void 0 : _f.height) || 300, scale: this.config.finalScale, paths: path, noBezier: attrSplit.includes('position'), selection: (_g = this.context.animPathSelection) === null || _g === void 0 ? void 0 : _g.selection, onPointMouseDown: this.onPointMouseDown.bind(this), onBezierPointMouseDown: this.onBezierPointMouseDown.bind(this), onCancelSelection: () => {
|
|
330
|
+
var _a;
|
|
331
|
+
(_a = this.context.animPathSelection) === null || _a === void 0 ? void 0 : _a.clearSelection();
|
|
332
|
+
this.draw();
|
|
333
|
+
} }));
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
__decorate([
|
|
337
|
+
entity(EditorStateConfigEntity),
|
|
338
|
+
__metadata("design:type", EditorStateConfigEntity)
|
|
339
|
+
], AnimPathEditLayer.prototype, "editorState", void 0);
|
|
340
|
+
__decorate([
|
|
341
|
+
entity(DocumentEntity),
|
|
342
|
+
__metadata("design:type", DocumentEntity)
|
|
343
|
+
], AnimPathEditLayer.prototype, "documentEntity", void 0);
|
|
344
|
+
__decorate([
|
|
345
|
+
entity(ExtendEntity),
|
|
346
|
+
__metadata("design:type", ExtendEntity)
|
|
347
|
+
], AnimPathEditLayer.prototype, "extendEntity", void 0);
|
|
348
|
+
__decorate([
|
|
349
|
+
able(Selectable),
|
|
350
|
+
__metadata("design:type", Array)
|
|
351
|
+
], AnimPathEditLayer.prototype, "selectableNodes", void 0);
|
|
352
|
+
//# sourceMappingURL=anim-path-edit-layer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"anim-path-edit-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/anim-path-edit-layer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { GameSceneIDE, GameWidgetIDE, RenderEngineIDEService } from '@gedit/rend
|
|
|
4
4
|
import { AppConfigData } from '@gedit/app-config/lib/common';
|
|
5
5
|
import { Disposable, DisposableImpl, Emitter, SizeSchema } from '@gedit/utils';
|
|
6
6
|
import { EntityManager } from '@gedit/playground';
|
|
7
|
+
import { TimelineService } from '../model';
|
|
7
8
|
interface GameObjectState {
|
|
8
9
|
selectable: boolean;
|
|
9
10
|
adsorbable: boolean;
|
|
@@ -15,6 +16,7 @@ export interface CanvasDrawOpts {
|
|
|
15
16
|
renderEngine: RenderEngineIDEService;
|
|
16
17
|
assetsURI: string;
|
|
17
18
|
getComponentContent: (compId: string, parentNode?: Editor2dNode, getParent?: boolean) => Editor2dNode[] | undefined;
|
|
19
|
+
getTimelineService?: () => TimelineService | undefined;
|
|
18
20
|
isSnapshot?: boolean;
|
|
19
21
|
isTemplate?: boolean;
|
|
20
22
|
}
|
|
@@ -75,6 +77,7 @@ export declare class CanvasDraw extends DisposableImpl {
|
|
|
75
77
|
protected lastRenderKeys: string[];
|
|
76
78
|
protected renderWidgetDispose: Disposable | undefined;
|
|
77
79
|
protected pixelArt: boolean;
|
|
80
|
+
protected multiplyAlpha: boolean;
|
|
78
81
|
renderWidget?: GameWidgetIDE;
|
|
79
82
|
private allCount;
|
|
80
83
|
private currentSymbols;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,UAAU,EAEV,cAAc,EACd,eAAe,
|
|
1
|
+
{"version":3,"file":"canvas-draw.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw.ts"],"names":[],"mappings":"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"}
|