aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kim <andrewdkim@users.noreply.github.com>2020-02-05 01:01:54 -0500
committerAndrew Kim <andrewdkim@users.noreply.github.com>2020-02-05 01:01:54 -0500
commitc1846375f87b82ea2391f0e56bd1606e34a8f69b (patch)
tree02ec620ea5716b02358b9b7a993ec2c7b2e9b0fc
parent6b8060dd969b314728a86fcd2fefc0e667ba079b (diff)
major changes
-rw-r--r--src/client/views/animationtimeline/Track.tsx27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index 32fa1d9ca..09ebbab14 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -91,6 +91,17 @@ export class Track extends React.Component<IProps> {
let keyframes: List<Doc> = (Cast(this.saveStateRegion!.keyframes, listSpec(Doc)) as List<Doc>);
let kfIndex: number = keyframes.indexOf(this.saveStateKf!);
let kf = keyframes[kfIndex] as Doc; //index in the keyframe
+ if (this._newKeyframe) {
+ console.log("new keyframe registering");
+ let kfList = DocListCast(this.saveStateRegion!.keyframes);
+ kfList.forEach(kf => {
+ kf.key = this.makeCopy();
+ if (kfList.indexOf(kf) === 0 || kfList.indexOf(kf) === 3){
+ (kf.key as Doc).opacity = 0.1;
+ }
+ });
+ this._newKeyframe = false;
+ }
if (!kf) return;
if (kf.type === KeyframeFunc.KeyframeType.default) { // only save for non-fades
kf.key = this.makeCopy();
@@ -110,21 +121,10 @@ export class Track extends React.Component<IProps> {
(Cast(edge!.key, Doc)! as Doc).opacity = 0.1;
(Cast(rightkf!.key, Doc)! as Doc).opacity = 1;
}
- } else if (this._newKeyframe) {
- // console.log("new keyframe registering");
- // let kfList = DocListCast(this.saveStateRegion!.keyframes);
- // kfList.forEach(kf => {
- // kf.key = this.makeCopy();
- // if (kfList.indexOf(kf) === 0 || kfList.indexOf(kf) === 3){
- // (kf.key as Doc).opacity = 0.1;
- // }
- // });
-
}
keyframes[kfIndex] = kf;
this.saveStateKf = undefined;
this.saveStateRegion = undefined;
- this._newKeyframe = false;
}
@@ -223,7 +223,10 @@ export class Track extends React.Component<IProps> {
timeChange = async () => {
if (this.saveStateKf !== undefined) {
await this.saveKeyframe();
- }
+ } else if (this._newKeyframe){
+ console.log("CALLED");
+ await this.saveKeyframe();
+ }
let regiondata = await this.findRegion(Math.round(this.time)); //finds a region that the scrubber is on
if (regiondata) {
let leftkf: (Doc | undefined) = await KeyframeFunc.calcMinLeft(regiondata, this.time); // lef keyframe, if it exists