aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/animationtimeline
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/animationtimeline')
-rw-r--r--src/client/views/animationtimeline/Timeline.tsx4
-rw-r--r--src/client/views/animationtimeline/TimelineMenu.tsx81
-rw-r--r--src/client/views/animationtimeline/Track.tsx50
3 files changed, 67 insertions, 68 deletions
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index 77656b85f..466cbb867 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -525,8 +525,8 @@ export class Timeline extends React.Component<FieldViewProps> {
@action.bound
changeLengths() {
if (this._infoContainer.current) {
- this._visibleLength = this._infoContainer.current!.getBoundingClientRect().width; //the visible length of the timeline (the length that you current see)
- this._visibleStart = this._infoContainer.current!.scrollLeft; //where the div starts
+ this._visibleLength = this._infoContainer.current.getBoundingClientRect().width; //the visible length of the timeline (the length that you current see)
+ this._visibleStart = this._infoContainer.current.scrollLeft; //where the div starts
}
}
diff --git a/src/client/views/animationtimeline/TimelineMenu.tsx b/src/client/views/animationtimeline/TimelineMenu.tsx
index 59c25596e..53ca9acad 100644
--- a/src/client/views/animationtimeline/TimelineMenu.tsx
+++ b/src/client/views/animationtimeline/TimelineMenu.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
-import {observable, action, runInAction} from "mobx";
-import {observer} from "mobx-react";
-import "./TimelineMenu.scss";
+import { observable, action, runInAction } from "mobx";
+import { observer } from "mobx-react";
+import "./TimelineMenu.scss";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faChartLine, faRoad, faClipboard, faPen, faTrash, faTable } from "@fortawesome/free-solid-svg-icons";
import { Utils } from "../../../Utils";
@@ -9,67 +9,66 @@ import { Utils } from "../../../Utils";
@observer
export class TimelineMenu extends React.Component {
- public static Instance:TimelineMenu;
+ public static Instance: TimelineMenu;
@observable private _opacity = 0;
- @observable private _x = 0;
- @observable private _y = 0;
- @observable private _currentMenu:JSX.Element[] = [];
+ @observable private _x = 0;
+ @observable private _y = 0;
+ @observable private _currentMenu: JSX.Element[] = [];
- constructor (props:Readonly<{}>){
- super(props);
- TimelineMenu.Instance = this;
+ constructor(props: Readonly<{}>) {
+ super(props);
+ TimelineMenu.Instance = this;
}
-
+
@action
- openMenu = (x?:number, y?:number) => {
- this._opacity = 1;
- x ? this._x = x : this._x = 0;
- y ? this._y = y : this._y = 0;
+ openMenu = (x?: number, y?: number) => {
+ this._opacity = 1;
+ x ? this._x = x : this._x = 0;
+ y ? this._y = y : this._y = 0;
}
@action
closeMenu = () => {
- this._opacity = 0;
- this._currentMenu = [];
- this._x = -1000000;
- this._y = -1000000;
+ this._opacity = 0;
+ this._currentMenu = [];
+ this._x = -1000000;
+ this._y = -1000000;
}
@action
- addItem = (type: "input" | "button", title: string, event: (e:any, ...args:any[]) => void) => {
- if (type === "input"){
- let inputRef = React.createRef<HTMLInputElement>();
- let text = "";
- this._currentMenu.push(<div key={Utils.GenerateGuid()} className="timeline-menu-item"><FontAwesomeIcon icon={faClipboard} size="lg"/><input className="timeline-menu-input" ref = {inputRef} placeholder={title} onChange={(e) => {
+ addItem = (type: "input" | "button", title: string, event: (e: any, ...args: any[]) => void) => {
+ if (type === "input") {
+ const inputRef = React.createRef<HTMLInputElement>();
+ let text = "";
+ this._currentMenu.push(<div key={Utils.GenerateGuid()} className="timeline-menu-item"><FontAwesomeIcon icon={faClipboard} size="lg" /><input className="timeline-menu-input" ref={inputRef} placeholder={title} onChange={(e) => {
e.stopPropagation();
text = e.target.value;
}} onKeyDown={(e) => {
if (e.keyCode === 13) {
- event(text);
- this.closeMenu();
- e.stopPropagation();
- }
- }}/></div>);
+ event(text);
+ this.closeMenu();
+ e.stopPropagation();
+ }
+ }} /></div>);
} else if (type === "button") {
- let buttonRef = React.createRef<HTMLDivElement>();
- this._currentMenu.push( <div key={Utils.GenerateGuid()} className="timeline-menu-item"><FontAwesomeIcon icon={faChartLine}size="lg"/><p className="timeline-menu-desc" onClick={(e) => {
- e.preventDefault();
- e.stopPropagation();
- event(e);
- this.closeMenu();
- }}>{title}</p></div>);
- }
+ this._currentMenu.push(<div key={Utils.GenerateGuid()} className="timeline-menu-item"><FontAwesomeIcon icon={faChartLine} size="lg" /><p className="timeline-menu-desc" onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ event(e);
+ this.closeMenu();
+ }}>{title}</p></div>);
+ }
}
- @action
- addMenu = (title:string) => {
- this._currentMenu.unshift(<div key={Utils.GenerateGuid()} className="timeline-menu-header"><p className="timeline-menu-header-desc">{title}</p></div>);
+ @action
+ addMenu = (title: string) => {
+ this._currentMenu.unshift(<div key={Utils.GenerateGuid()} className="timeline-menu-header"><p className="timeline-menu-header-desc">{title}</p></div>);
}
render() {
return (
- <div key={Utils.GenerateGuid()} className="timeline-menu-container" style={{opacity: this._opacity, left: this._x, top: this._y}} >
+ <div key={Utils.GenerateGuid()} className="timeline-menu-container" style={{ opacity: this._opacity, left: this._x, top: this._y }} >
{this._currentMenu}
</div>
);
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index 79eb60fae..461db4858 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -90,9 +90,9 @@ export class Track extends React.Component<IProps> {
*/
@action
saveKeyframe = async () => {
- let keyframes = Cast(this.saveStateRegion?.keyframes, listSpec(Doc)) as List<Doc>;
- let kfIndex = keyframes.indexOf(this.saveStateKf!);
- let kf = keyframes[kfIndex] as Doc; //index in the keyframe
+ const keyframes = Cast(this.saveStateRegion?.keyframes, listSpec(Doc)) as List<Doc>;
+ const kfIndex = keyframes.indexOf(this.saveStateKf!);
+ const kf = keyframes[kfIndex] as Doc; //index in the keyframe
if (this._newKeyframe) {
DocListCast(this.saveStateRegion?.keyframes).forEach((kf, index) => {
this.copyDocDataToKeyFrame(kf);
@@ -103,17 +103,17 @@ export class Track extends React.Component<IProps> {
if (!kf) return;
if (kf.type === KeyframeFunc.KeyframeType.default) { // only save for non-fades
this.copyDocDataToKeyFrame(kf);
- let leftkf = KeyframeFunc.calcMinLeft(this.saveStateRegion!, this.time, kf); // lef keyframe, if it exists
- let rightkf = KeyframeFunc.calcMinRight(this.saveStateRegion!, this.time, kf); //right keyframe, if it exists
+ const leftkf = KeyframeFunc.calcMinLeft(this.saveStateRegion!, this.time, kf); // lef keyframe, if it exists
+ const rightkf = KeyframeFunc.calcMinRight(this.saveStateRegion!, this.time, kf); //right keyframe, if it exists
if (leftkf?.type === KeyframeFunc.KeyframeType.fade) { //replicating this keyframe to fades
- let edge = KeyframeFunc.calcMinLeft(this.saveStateRegion!, this.time, leftkf);
+ const edge = KeyframeFunc.calcMinLeft(this.saveStateRegion!, this.time, leftkf);
edge && this.copyDocDataToKeyFrame(edge);
leftkf && this.copyDocDataToKeyFrame(leftkf);
- edge && (edge!.opacity = 0.1);
- leftkf && (leftkf!.opacity = 1);
+ edge && (edge.opacity = 0.1);
+ leftkf && (leftkf.opacity = 1);
}
if (rightkf?.type === KeyframeFunc.KeyframeType.fade) {
- let edge = KeyframeFunc.calcMinRight(this.saveStateRegion!, this.time, rightkf);
+ const edge = KeyframeFunc.calcMinRight(this.saveStateRegion!, this.time, rightkf);
edge && this.copyDocDataToKeyFrame(edge);
rightkf && this.copyDocDataToKeyFrame(rightkf);
edge && (edge.opacity = 0.1);
@@ -142,7 +142,7 @@ export class Track extends React.Component<IProps> {
//check for region
const region = this.findRegion(this.time);
if (region !== undefined) { //if region at scrub time exist
- let r = region as RegionData; //for some region is returning undefined... which is not the case
+ const r = region as RegionData; //for some region is returning undefined... which is not the case
if (DocListCast(r.keyframes).find(kf => kf.time === this.time) === undefined) { //basically when there is no additional keyframe at that timespot
this.makeKeyData(r, this.time, KeyframeFunc.KeyframeType.default);
}
@@ -222,11 +222,11 @@ export class Track extends React.Component<IProps> {
} else if (this._newKeyframe) {
await this.saveKeyframe();
}
- let regiondata = await this.findRegion(Math.round(this.time)); //finds a region that the scrubber is on
+ const 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
- let rightkf: (Doc | undefined) = await KeyframeFunc.calcMinRight(regiondata, this.time); //right keyframe, if it exists
- let currentkf: (Doc | undefined) = await this.calcCurrent(regiondata); //if the scrubber is on top of the keyframe
+ const leftkf: (Doc | undefined) = await KeyframeFunc.calcMinLeft(regiondata, this.time); // lef keyframe, if it exists
+ const rightkf: (Doc | undefined) = await KeyframeFunc.calcMinRight(regiondata, this.time); //right keyframe, if it exists
+ const currentkf: (Doc | undefined) = await this.calcCurrent(regiondata); //if the scrubber is on top of the keyframe
if (currentkf) {
console.log("is current");
await this.applyKeys(currentkf);
@@ -248,7 +248,7 @@ export class Track extends React.Component<IProps> {
if (!kf[key]) {
this.props.node[key] = undefined;
} else {
- let stored = kf[key];
+ const stored = kf[key];
this.props.node[key] = stored instanceof ObjectField ? stored[Copy]() : stored;
}
});
@@ -261,7 +261,7 @@ export class Track extends React.Component<IProps> {
@action
calcCurrent = (region: Doc) => {
let currentkf: (Doc | undefined) = undefined;
- let keyframes = DocListCast(region.keyframes!);
+ const keyframes = DocListCast(region.keyframes!);
keyframes.forEach((kf) => {
if (NumCast(kf.time) === Math.round(this.time)) currentkf = kf;
});
@@ -276,12 +276,12 @@ export class Track extends React.Component<IProps> {
interpolate = async (left: Doc, right: Doc) => {
this.primitiveWhitelist.forEach(key => {
if (left[key] && right[key] && typeof (left[key]) === "number" && typeof (right[key]) === "number") { //if it is number, interpolate
- let dif = NumCast(right[key]) - NumCast(left[key]);
- let deltaLeft = this.time - NumCast(left.time);
- let ratio = deltaLeft / (NumCast(right.time) - NumCast(left.time));
+ const dif = NumCast(right[key]) - NumCast(left[key]);
+ const deltaLeft = this.time - NumCast(left.time);
+ const ratio = deltaLeft / (NumCast(right.time) - NumCast(left.time));
this.props.node[key] = NumCast(left[key]) + (dif * ratio);
} else { // case data
- let stored = left[key];
+ const stored = left[key];
this.props.node[key] = stored instanceof ObjectField ? stored[Copy]() : stored;
}
});
@@ -301,8 +301,8 @@ export class Track extends React.Component<IProps> {
*/
@action
onInnerDoubleClick = (e: React.MouseEvent) => {
- let inner = this._inner.current!;
- let offsetX = Math.round((e.clientX - inner.getBoundingClientRect().left) * this.props.transform.Scale);
+ const inner = this._inner.current!;
+ const offsetX = Math.round((e.clientX - inner.getBoundingClientRect().left) * this.props.transform.Scale);
this.createRegion(KeyframeFunc.convertPixelTime(offsetX, "mili", "time", this.props.tickSpacing, this.props.tickIncrement));
}
@@ -313,10 +313,10 @@ export class Track extends React.Component<IProps> {
@action
createRegion = (time: number) => {
if (this.findRegion(time) === undefined) { //check if there is a region where double clicking (prevents phantom regions)
- let regiondata = KeyframeFunc.defaultKeyframe(); //create keyframe data
+ const regiondata = KeyframeFunc.defaultKeyframe(); //create keyframe data
regiondata.position = time; //set position
- let rightRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.right, regiondata, this.regions);
+ const rightRegion = KeyframeFunc.findAdjacentRegion(KeyframeFunc.Direction.right, regiondata, this.regions);
if (rightRegion && rightRegion.position - regiondata.position <= 4000) { //edge case when there is less than default 4000 duration space between this and right region
regiondata.duration = rightRegion.position - regiondata.position;
@@ -332,7 +332,7 @@ export class Track extends React.Component<IProps> {
@action
makeKeyData = (regiondata: RegionData, time: number, type: KeyframeFunc.KeyframeType = KeyframeFunc.KeyframeType.default) => { //Kfpos is mouse offsetX, representing time
- const trackKeyFrames = DocListCast(regiondata.keyframes)!;
+ const trackKeyFrames = DocListCast(regiondata.keyframes);
const existingkf = trackKeyFrames.find(TK => TK.time === time);
if (existingkf) return existingkf;
//else creates a new doc.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-11-13 11:30:07 +0000