|
@@ -138,10 +138,16 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
} else {
|
|
} else {
|
|
this._isTargetedAnimation = false;
|
|
this._isTargetedAnimation = false;
|
|
|
|
|
|
- let hasAnimations = this.props.entity.animations !== undefined || this.props.entity.animations !== null ? this.props.entity.animations : false;
|
|
|
|
|
|
+ let hasAnimations =
|
|
|
|
+ this.props.entity.animations !== undefined || this.props.entity.animations !== null
|
|
|
|
+ ? this.props.entity.animations
|
|
|
|
+ : false;
|
|
initialSelection = hasAnimations !== false ? hasAnimations && hasAnimations[0] : null;
|
|
initialSelection = hasAnimations !== false ? hasAnimations && hasAnimations[0] : null;
|
|
|
|
|
|
- initialLerpMode = initialSelection !== undefined ? this.analizeAnimationForLerp(this.props.entity.animations && initialSelection) : false;
|
|
|
|
|
|
+ initialLerpMode =
|
|
|
|
+ initialSelection !== undefined
|
|
|
|
+ ? this.analizeAnimationForLerp(this.props.entity.animations && initialSelection)
|
|
|
|
+ : false;
|
|
initialPathData = initialSelection && this.getPathData(initialSelection);
|
|
initialPathData = initialSelection && this.getPathData(initialSelection);
|
|
initialPathData = initialPathData === null || initialPathData === undefined ? undefined : initialPathData;
|
|
initialPathData = initialPathData === null || initialPathData === undefined ? undefined : initialPathData;
|
|
}
|
|
}
|
|
@@ -162,7 +168,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
isTangentMode: false,
|
|
isTangentMode: false,
|
|
isBrokenMode: false,
|
|
isBrokenMode: false,
|
|
lerpMode: initialLerpMode,
|
|
lerpMode: initialLerpMode,
|
|
- playheadOffset: this._graphCanvas.current ? this._graphCanvas.current.children[0].clientWidth / (_canvasLength * 10) : 0,
|
|
|
|
|
|
+ playheadOffset: this._graphCanvas.current
|
|
|
|
+ ? this._graphCanvas.current.children[0].clientWidth / (_canvasLength * 10)
|
|
|
|
+ : 0,
|
|
frameAxisLength: this.setFrameAxis(_canvasLength),
|
|
frameAxisLength: this.setFrameAxis(_canvasLength),
|
|
valueAxisLength: new Array(10).fill(0).map((s, i) => {
|
|
valueAxisLength: new Array(10).fill(0).map((s, i) => {
|
|
return { value: i * 10, label: valueInd[i] };
|
|
return { value: i * 10, label: valueInd[i] };
|
|
@@ -192,7 +200,11 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
componentDidMount() {
|
|
componentDidMount() {
|
|
this.state.selected && this.selectAnimation(this.state.selected);
|
|
this.state.selected && this.selectAnimation(this.state.selected);
|
|
|
|
|
|
- if (this._editor.current && this._editor.current.ownerDocument && this._editor.current.ownerDocument.defaultView) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ this._editor.current &&
|
|
|
|
+ this._editor.current.ownerDocument &&
|
|
|
|
+ this._editor.current.ownerDocument.defaultView
|
|
|
|
+ ) {
|
|
this._editorWindow = this._editor.current.ownerDocument.defaultView;
|
|
this._editorWindow = this._editor.current.ownerDocument.defaultView;
|
|
this._editorWindow.addEventListener("resize", this.onWindowResizeWidth.bind(this));
|
|
this._editorWindow.addEventListener("resize", this.onWindowResizeWidth.bind(this));
|
|
}
|
|
}
|
|
@@ -313,7 +325,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
resetPlayheadOffset() {
|
|
resetPlayheadOffset() {
|
|
if (this._graphCanvas && this._graphCanvas.current) {
|
|
if (this._graphCanvas && this._graphCanvas.current) {
|
|
this.setState({
|
|
this.setState({
|
|
- playheadOffset: this._graphCanvas.current.children[0].clientWidth / (this.state.canvasLength * 10 * this.state.scale),
|
|
|
|
|
|
+ playheadOffset:
|
|
|
|
+ this._graphCanvas.current.children[0].clientWidth /
|
|
|
|
+ (this.state.canvasLength * 10 * this.state.scale),
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -394,18 +408,24 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
};
|
|
};
|
|
|
|
|
|
selectedControlPoint = (type: string, id: string) => {
|
|
selectedControlPoint = (type: string, id: string) => {
|
|
|
|
+ const controlPoint = this.state.svgKeyframes?.find((x) => x.id === id);
|
|
|
|
+ if (controlPoint) {
|
|
|
|
+ let isSelected;
|
|
|
|
+ if (type === "left") {
|
|
|
|
+ isSelected = controlPoint.isLeftActive;
|
|
|
|
+ controlPoint.isLeftActive = !isSelected;
|
|
|
|
+ controlPoint.isRightActive = false;
|
|
|
|
+ }
|
|
|
|
+ if (type === "right") {
|
|
|
|
+ isSelected = controlPoint.isRightActive;
|
|
|
|
+ controlPoint.isRightActive = !isSelected;
|
|
|
|
+ controlPoint.isLeftActive = false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
let updatedKeyframes = this.state.svgKeyframes?.map((kf) => {
|
|
let updatedKeyframes = this.state.svgKeyframes?.map((kf) => {
|
|
if (kf.id === id) {
|
|
if (kf.id === id) {
|
|
- kf.isLeftActive = true;
|
|
|
|
- kf.isRightActive = false;
|
|
|
|
- if (type === "left") {
|
|
|
|
- kf.isLeftActive = true;
|
|
|
|
- kf.isRightActive = false;
|
|
|
|
- }
|
|
|
|
- if (type === "right") {
|
|
|
|
- kf.isRightActive = true;
|
|
|
|
- kf.isLeftActive = false;
|
|
|
|
- }
|
|
|
|
|
|
+ kf === controlPoint;
|
|
}
|
|
}
|
|
return kf;
|
|
return kf;
|
|
});
|
|
});
|
|
@@ -425,7 +445,12 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
});
|
|
});
|
|
};
|
|
};
|
|
|
|
|
|
- updateValuePerCoordinate(dataType: number, value: number | Vector2 | Vector3 | Color3 | Color4 | Size | Quaternion, newValue: number, coordinate?: number) {
|
|
|
|
|
|
+ updateValuePerCoordinate(
|
|
|
|
+ dataType: number,
|
|
|
|
+ value: number | Vector2 | Vector3 | Color3 | Color4 | Size | Quaternion,
|
|
|
|
+ newValue: number,
|
|
|
|
+ coordinate?: number
|
|
|
|
+ ) {
|
|
if (dataType === Animation.ANIMATIONTYPE_FLOAT) {
|
|
if (dataType === Animation.ANIMATIONTYPE_FLOAT) {
|
|
value = newValue;
|
|
value = newValue;
|
|
}
|
|
}
|
|
@@ -579,9 +604,15 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- let updatedValue = ((this._heightScale - updatedSvgKeyFrame.keyframePoint.y) / this._heightScale) * this._scaleFactor;
|
|
|
|
|
|
+ let updatedValue =
|
|
|
|
+ ((this._heightScale - updatedSvgKeyFrame.keyframePoint.y) / this._heightScale) * this._scaleFactor;
|
|
|
|
|
|
- const updatedValueInCoordinate = this.updateValuePerCoordinate(animation.dataType, keys[index].value, updatedValue, coordinate);
|
|
|
|
|
|
+ const updatedValueInCoordinate = this.updateValuePerCoordinate(
|
|
|
|
+ animation.dataType,
|
|
|
|
+ keys[index].value,
|
|
|
|
+ updatedValue,
|
|
|
|
+ coordinate
|
|
|
|
+ );
|
|
|
|
|
|
keys[index].value = updatedValueInCoordinate;
|
|
keys[index].value = updatedValueInCoordinate;
|
|
|
|
|
|
@@ -598,7 +629,12 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
this.selectAnimation(animation, coordinate);
|
|
this.selectAnimation(animation, coordinate);
|
|
};
|
|
};
|
|
|
|
|
|
- updateLeftControlPoint(updatedSvgKeyFrame: IKeyframeSvgPoint, key: IAnimationKey, dataType: number, coordinate: number) {
|
|
|
|
|
|
+ updateLeftControlPoint(
|
|
|
|
+ updatedSvgKeyFrame: IKeyframeSvgPoint,
|
|
|
|
+ key: IAnimationKey,
|
|
|
|
+ dataType: number,
|
|
|
|
+ coordinate: number
|
|
|
|
+ ) {
|
|
if (updatedSvgKeyFrame.isLeftActive) {
|
|
if (updatedSvgKeyFrame.isLeftActive) {
|
|
if (updatedSvgKeyFrame.leftControlPoint !== null) {
|
|
if (updatedSvgKeyFrame.leftControlPoint !== null) {
|
|
// Rotate Control Points
|
|
// Rotate Control Points
|
|
@@ -609,11 +645,16 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
|
|
|
|
let distanceAmplitudeOfX = updatedSvgKeyFrame.leftControlPoint.x - distanceWithPreviousKeyframe;
|
|
let distanceAmplitudeOfX = updatedSvgKeyFrame.leftControlPoint.x - distanceWithPreviousKeyframe;
|
|
|
|
|
|
- let slope = (updatedSvgKeyFrame.leftControlPoint.y - updatedSvgKeyFrame.keyframePoint.y) / (updatedSvgKeyFrame.leftControlPoint.x - updatedSvgKeyFrame.keyframePoint.x);
|
|
|
|
|
|
+ let slope =
|
|
|
|
+ (updatedSvgKeyFrame.leftControlPoint.y - updatedSvgKeyFrame.keyframePoint.y) /
|
|
|
|
+ (updatedSvgKeyFrame.leftControlPoint.x - updatedSvgKeyFrame.keyframePoint.x);
|
|
|
|
|
|
- let newValueOfY = (distanceAmplitudeOfX - updatedSvgKeyFrame.leftControlPoint.x) * slope + updatedSvgKeyFrame.keyframePoint.y;
|
|
|
|
|
|
+ let newValueOfY =
|
|
|
|
+ (distanceAmplitudeOfX - updatedSvgKeyFrame.leftControlPoint.x) * slope +
|
|
|
|
+ updatedSvgKeyFrame.keyframePoint.y;
|
|
|
|
|
|
- let updatedValue = ((newValueOfY - updatedSvgKeyFrame.keyframePoint.y) * this._scaleFactor) / this._heightScale;
|
|
|
|
|
|
+ let updatedValue =
|
|
|
|
+ ((newValueOfY - updatedSvgKeyFrame.keyframePoint.y) * this._scaleFactor) / this._heightScale;
|
|
|
|
|
|
if (updatedValue > -100 && updatedValue < 100) {
|
|
if (updatedValue > -100 && updatedValue < 100) {
|
|
key.inTangent = this.updateValuePerCoordinate(dataType, key.inTangent, updatedValue, coordinate);
|
|
key.inTangent = this.updateValuePerCoordinate(dataType, key.inTangent, updatedValue, coordinate);
|
|
@@ -630,7 +671,12 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- updateRightControlPoint(updatedSvgKeyFrame: IKeyframeSvgPoint, key: IAnimationKey, dataType: number, coordinate: number) {
|
|
|
|
|
|
+ updateRightControlPoint(
|
|
|
|
+ updatedSvgKeyFrame: IKeyframeSvgPoint,
|
|
|
|
+ key: IAnimationKey,
|
|
|
|
+ dataType: number,
|
|
|
|
+ coordinate: number
|
|
|
|
+ ) {
|
|
if (updatedSvgKeyFrame.isRightActive) {
|
|
if (updatedSvgKeyFrame.isRightActive) {
|
|
if (updatedSvgKeyFrame.rightControlPoint !== null) {
|
|
if (updatedSvgKeyFrame.rightControlPoint !== null) {
|
|
// Rotate Control Points
|
|
// Rotate Control Points
|
|
@@ -639,11 +685,16 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
|
|
|
|
let distanceAmplitudeOfX = updatedSvgKeyFrame.rightControlPoint.x + distanceWithNextKeyframe;
|
|
let distanceAmplitudeOfX = updatedSvgKeyFrame.rightControlPoint.x + distanceWithNextKeyframe;
|
|
|
|
|
|
- let slope = (updatedSvgKeyFrame.rightControlPoint.y - updatedSvgKeyFrame.keyframePoint.y) / (updatedSvgKeyFrame.rightControlPoint.x - updatedSvgKeyFrame.keyframePoint.x);
|
|
|
|
|
|
+ let slope =
|
|
|
|
+ (updatedSvgKeyFrame.rightControlPoint.y - updatedSvgKeyFrame.keyframePoint.y) /
|
|
|
|
+ (updatedSvgKeyFrame.rightControlPoint.x - updatedSvgKeyFrame.keyframePoint.x);
|
|
|
|
|
|
- let newValueOfY = (distanceAmplitudeOfX - updatedSvgKeyFrame.rightControlPoint.x) * slope + updatedSvgKeyFrame.keyframePoint.y;
|
|
|
|
|
|
+ let newValueOfY =
|
|
|
|
+ (distanceAmplitudeOfX - updatedSvgKeyFrame.rightControlPoint.x) * slope +
|
|
|
|
+ updatedSvgKeyFrame.keyframePoint.y;
|
|
|
|
|
|
- let updatedValue = ((newValueOfY - updatedSvgKeyFrame.keyframePoint.y) * this._scaleFactor) / this._heightScale;
|
|
|
|
|
|
+ let updatedValue =
|
|
|
|
+ ((newValueOfY - updatedSvgKeyFrame.keyframePoint.y) * this._scaleFactor) / this._heightScale;
|
|
|
|
|
|
if (updatedValue > -100 && updatedValue < 100) {
|
|
if (updatedValue > -100 && updatedValue < 100) {
|
|
key.outTangent = this.updateValuePerCoordinate(dataType, key.outTangent, updatedValue, coordinate);
|
|
key.outTangent = this.updateValuePerCoordinate(dataType, key.outTangent, updatedValue, coordinate);
|
|
@@ -665,7 +716,8 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
let indexOfKeyframe = this.state.svgKeyframes.indexOf(updatedSvgKeyFrame);
|
|
let indexOfKeyframe = this.state.svgKeyframes.indexOf(updatedSvgKeyFrame);
|
|
let previousKeyframe = this.state.svgKeyframes[indexOfKeyframe - 1];
|
|
let previousKeyframe = this.state.svgKeyframes[indexOfKeyframe - 1];
|
|
if (previousKeyframe?.keyframePoint) {
|
|
if (previousKeyframe?.keyframePoint) {
|
|
- distanceWithPreviousKeyframe = Vector2.Distance(updatedSvgKeyFrame.keyframePoint, previousKeyframe.keyframePoint) / 2;
|
|
|
|
|
|
+ distanceWithPreviousKeyframe =
|
|
|
|
+ Vector2.Distance(updatedSvgKeyFrame.keyframePoint, previousKeyframe.keyframePoint) / 2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -674,7 +726,8 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
let indexOfKeyframe = this.state.svgKeyframes.indexOf(updatedSvgKeyFrame);
|
|
let indexOfKeyframe = this.state.svgKeyframes.indexOf(updatedSvgKeyFrame);
|
|
let nextKeyframe = this.state.svgKeyframes[indexOfKeyframe + 1];
|
|
let nextKeyframe = this.state.svgKeyframes[indexOfKeyframe + 1];
|
|
if (nextKeyframe?.keyframePoint) {
|
|
if (nextKeyframe?.keyframePoint) {
|
|
- distanceWithNextKeyframe = Vector2.Distance(nextKeyframe.keyframePoint, updatedSvgKeyFrame.keyframePoint) / 2;
|
|
|
|
|
|
+ distanceWithNextKeyframe =
|
|
|
|
+ Vector2.Distance(nextKeyframe.keyframePoint, updatedSvgKeyFrame.keyframePoint) / 2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -734,7 +787,12 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
};
|
|
};
|
|
|
|
|
|
setKeyframeValue = () => {
|
|
setKeyframeValue = () => {
|
|
- if (this.state.actionableKeyframe.frame !== "" && this.state.actionableKeyframe.frame !== undefined && this.state.actionableKeyframe.value !== "" && this.state.actionableKeyframe.value !== undefined) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ this.state.actionableKeyframe.frame !== "" &&
|
|
|
|
+ this.state.actionableKeyframe.frame !== undefined &&
|
|
|
|
+ this.state.actionableKeyframe.value !== "" &&
|
|
|
|
+ this.state.actionableKeyframe.value !== undefined
|
|
|
|
+ ) {
|
|
if (this.state.selected !== null) {
|
|
if (this.state.selected !== null) {
|
|
let currentSelected = this.state.svgKeyframes?.find((kf) => kf.selected);
|
|
let currentSelected = this.state.svgKeyframes?.find((kf) => kf.selected);
|
|
if (currentSelected) {
|
|
if (currentSelected) {
|
|
@@ -789,7 +847,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
setBrokenMode = () => {
|
|
setBrokenMode = () => {
|
|
if (this.state.selected !== null) {
|
|
if (this.state.selected !== null) {
|
|
let animation = this.state.selected;
|
|
let animation = this.state.selected;
|
|
- this.setState({ isBrokenMode: !this.state.isBrokenMode }, () => this.selectAnimation(animation, this.state.selectedCoordinate));
|
|
|
|
|
|
+ this.setState({ isBrokenMode: !this.state.isBrokenMode }, () =>
|
|
|
|
+ this.selectAnimation(animation, this.state.selectedCoordinate)
|
|
|
|
+ );
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|
|
@@ -797,7 +857,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
const animation = this.state.selected;
|
|
const animation = this.state.selected;
|
|
if (this.state.svgKeyframes && animation) {
|
|
if (this.state.svgKeyframes && animation) {
|
|
const keys = animation.getKeys();
|
|
const keys = animation.getKeys();
|
|
- const selectedControlPoint = this.state.svgKeyframes.find((keyframe: IKeyframeSvgPoint) => keyframe.selected && (keyframe.isLeftActive || keyframe.isRightActive));
|
|
|
|
|
|
+ const selectedControlPoint = this.state.svgKeyframes.find(
|
|
|
|
+ (keyframe: IKeyframeSvgPoint) => keyframe.selected && (keyframe.isLeftActive || keyframe.isRightActive)
|
|
|
|
+ );
|
|
if (selectedControlPoint !== null && selectedControlPoint) {
|
|
if (selectedControlPoint !== null && selectedControlPoint) {
|
|
const { order, coordinate } = this.decodeCurveId(selectedControlPoint.id);
|
|
const { order, coordinate } = this.decodeCurveId(selectedControlPoint.id);
|
|
const key = keys[order];
|
|
const key = keys[order];
|
|
@@ -1074,7 +1136,15 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
if (keyframes === undefined || keyframes.length === 0) {
|
|
if (keyframes === undefined || keyframes.length === 0) {
|
|
return undefined;
|
|
return undefined;
|
|
} else {
|
|
} else {
|
|
- const { easingMode, easingType, usesTangents, valueType, highestFrame, name, targetProperty } = this.getAnimationData(animation);
|
|
|
|
|
|
+ const {
|
|
|
|
+ easingMode,
|
|
|
|
+ easingType,
|
|
|
|
+ usesTangents,
|
|
|
|
+ valueType,
|
|
|
|
+ highestFrame,
|
|
|
|
+ name,
|
|
|
|
+ targetProperty,
|
|
|
|
+ } = this.getAnimationData(animation);
|
|
|
|
|
|
//keyframes = this.flatTangents(keyframes, valueType); // This will break because we are using setState before mounted...
|
|
//keyframes = this.flatTangents(keyframes, valueType); // This will break because we are using setState before mounted...
|
|
const startKey = keyframes[0];
|
|
const startKey = keyframes[0];
|
|
@@ -1088,7 +1158,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
|
|
|
|
const curveColor = valueType === Animation.ANIMATIONTYPE_FLOAT ? colors[4] : colors[d];
|
|
const curveColor = valueType === Animation.ANIMATIONTYPE_FLOAT ? colors[4] : colors[d];
|
|
// START OF LINE/CURVE
|
|
// START OF LINE/CURVE
|
|
- let data: string | undefined = `M${startKey.frame * this._pixelFrameUnit}, ${this._heightScale - startValue[d] * middle}`; //
|
|
|
|
|
|
+ let data: string | undefined = `M${startKey.frame * this._pixelFrameUnit}, ${
|
|
|
|
+ this._heightScale - startValue[d] * middle
|
|
|
|
+ }`; //
|
|
|
|
|
|
if (this.state) {
|
|
if (this.state) {
|
|
if (usesTangents) {
|
|
if (usesTangents) {
|
|
@@ -1128,7 +1200,11 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
let framesPerSecond = animation.framePerSecond;
|
|
let framesPerSecond = animation.framePerSecond;
|
|
let highestFrame = animation.getHighestFrame();
|
|
let highestFrame = animation.getHighestFrame();
|
|
//let serialized = animation.serialize();
|
|
//let serialized = animation.serialize();
|
|
- let usesTangents = animation.getKeys().find((kf) => kf.hasOwnProperty("inTangent") || kf.hasOwnProperty("outTangent")) !== undefined ? true : false;
|
|
|
|
|
|
+ let usesTangents =
|
|
|
|
+ animation.getKeys().find((kf) => kf.hasOwnProperty("inTangent") || kf.hasOwnProperty("outTangent")) !==
|
|
|
|
+ undefined
|
|
|
|
+ ? true
|
|
|
|
+ : false;
|
|
let valueType = animation.dataType;
|
|
let valueType = animation.dataType;
|
|
// easing properties
|
|
// easing properties
|
|
let easingType, easingMode;
|
|
let easingType, easingMode;
|
|
@@ -1156,7 +1232,14 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
- curvePathWithTangents(keyframes: IAnimationKey[], data: string, middle: number, type: number, coordinate: number, animationName: string) {
|
|
|
|
|
|
+ curvePathWithTangents(
|
|
|
|
+ keyframes: IAnimationKey[],
|
|
|
|
+ data: string,
|
|
|
|
+ middle: number,
|
|
|
|
+ type: number,
|
|
|
|
+ coordinate: number,
|
|
|
|
+ animationName: string
|
|
|
|
+ ) {
|
|
keyframes.forEach((key, i) => {
|
|
keyframes.forEach((key, i) => {
|
|
// Create a unique id for curve
|
|
// Create a unique id for curve
|
|
const curveId = this.encodeCurveId(animationName, i);
|
|
const curveId = this.encodeCurveId(animationName, i);
|
|
@@ -1210,8 +1293,10 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
defaultTangent = null;
|
|
defaultTangent = null;
|
|
}
|
|
}
|
|
|
|
|
|
- var inT = key.inTangent === undefined ? defaultTangent : this.getValueAsArray(type, key.inTangent)[coordinate];
|
|
|
|
- var outT = key.outTangent === undefined ? defaultTangent : this.getValueAsArray(type, key.outTangent)[coordinate];
|
|
|
|
|
|
+ var inT =
|
|
|
|
+ key.inTangent === undefined ? defaultTangent : this.getValueAsArray(type, key.inTangent)[coordinate];
|
|
|
|
+ var outT =
|
|
|
|
+ key.outTangent === undefined ? defaultTangent : this.getValueAsArray(type, key.outTangent)[coordinate];
|
|
|
|
|
|
let y = this._heightScale - keyframe_valueAsArray * middle;
|
|
let y = this._heightScale - keyframe_valueAsArray * middle;
|
|
|
|
|
|
@@ -1231,7 +1316,10 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
|
|
|
|
if (i === 0) {
|
|
if (i === 0) {
|
|
svgKeyframe = {
|
|
svgKeyframe = {
|
|
- keyframePoint: new Vector2(key.frame * this._pixelFrameUnit, this._heightScale - keyframe_valueAsArray * middle),
|
|
|
|
|
|
+ keyframePoint: new Vector2(
|
|
|
|
+ key.frame * this._pixelFrameUnit,
|
|
|
|
+ this._heightScale - keyframe_valueAsArray * middle
|
|
|
|
+ ),
|
|
rightControlPoint: outTangent,
|
|
rightControlPoint: outTangent,
|
|
leftControlPoint: null,
|
|
leftControlPoint: null,
|
|
id: curveId,
|
|
id: curveId,
|
|
@@ -1246,7 +1334,10 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
svgKeyframe = {
|
|
svgKeyframe = {
|
|
- keyframePoint: new Vector2(key.frame * this._pixelFrameUnit, this._heightScale - keyframe_valueAsArray * middle),
|
|
|
|
|
|
+ keyframePoint: new Vector2(
|
|
|
|
+ key.frame * this._pixelFrameUnit,
|
|
|
|
+ this._heightScale - keyframe_valueAsArray * middle
|
|
|
|
+ ),
|
|
rightControlPoint: outTangent,
|
|
rightControlPoint: outTangent,
|
|
leftControlPoint: inTangent,
|
|
leftControlPoint: inTangent,
|
|
id: curveId,
|
|
id: curveId,
|
|
@@ -1340,7 +1431,14 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
let intermediatePoint75 = new Vector2((pointB.x - pointA.x) * v + pointA.x, yInt75);
|
|
let intermediatePoint75 = new Vector2((pointB.x - pointA.x) * v + pointA.x, yInt75);
|
|
|
|
|
|
// Gets the four control points of bezier curve
|
|
// Gets the four control points of bezier curve
|
|
- let controlPoints = this.interpolateControlPoints(pointA, intermediatePoint25, u, intermediatePoint75, v, pointB);
|
|
|
|
|
|
+ let controlPoints = this.interpolateControlPoints(
|
|
|
|
+ pointA,
|
|
|
|
+ intermediatePoint25,
|
|
|
|
+ u,
|
|
|
|
+ intermediatePoint75,
|
|
|
|
+ v,
|
|
|
|
+ pointB
|
|
|
|
+ );
|
|
|
|
|
|
if (controlPoints !== undefined) {
|
|
if (controlPoints !== undefined) {
|
|
this.setKeyframePoint(controlPoints, i, keyframes.length);
|
|
this.setKeyframePoint(controlPoints, i, keyframes.length);
|
|
@@ -1380,7 +1478,14 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
this._svgKeyframes.push(svgKeyframe);
|
|
this._svgKeyframes.push(svgKeyframe);
|
|
}
|
|
}
|
|
|
|
|
|
- interpolateControlPoints(p0: Vector2, p1: Vector2, u: number, p2: Vector2, v: number, p3: Vector2): Vector2[] | undefined {
|
|
|
|
|
|
+ interpolateControlPoints(
|
|
|
|
+ p0: Vector2,
|
|
|
|
+ p1: Vector2,
|
|
|
|
+ u: number,
|
|
|
|
+ p2: Vector2,
|
|
|
|
+ v: number,
|
|
|
|
+ p3: Vector2
|
|
|
|
+ ): Vector2[] | undefined {
|
|
let a = 0.0;
|
|
let a = 0.0;
|
|
let b = 0.0;
|
|
let b = 0.0;
|
|
let c = 0.0;
|
|
let c = 0.0;
|
|
@@ -1518,7 +1623,12 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
if (keys.length !== 0) {
|
|
if (keys.length !== 0) {
|
|
const firstFrame = keys[0].frame;
|
|
const firstFrame = keys[0].frame;
|
|
const LastFrame = this.state.selected.getHighestFrame();
|
|
const LastFrame = this.state.selected.getHighestFrame();
|
|
- this._mainAnimatable = this.props.scene.beginAnimation(target, firstFrame, LastFrame, this.state.isLooping);
|
|
|
|
|
|
+ this._mainAnimatable = this.props.scene.beginAnimation(
|
|
|
|
+ target,
|
|
|
|
+ firstFrame,
|
|
|
|
+ LastFrame,
|
|
|
|
+ this.state.isLooping
|
|
|
|
+ );
|
|
this._mainAnimatable.stop();
|
|
this._mainAnimatable.stop();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1580,7 +1690,9 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
if (animation) {
|
|
if (animation) {
|
|
const hasKeyframe = animation.getKeys().find((x) => x.frame === frame);
|
|
const hasKeyframe = animation.getKeys().find((x) => x.frame === frame);
|
|
const currentValue = this.calculateCurrentPointInCurve(frame);
|
|
const currentValue = this.calculateCurrentPointInCurve(frame);
|
|
- const value = hasKeyframe ? this.getValueAsArray(animation.dataType, hasKeyframe.value)[this.state.selectedCoordinate] : currentValue ?? 0;
|
|
|
|
|
|
+ const value = hasKeyframe
|
|
|
|
+ ? this.getValueAsArray(animation.dataType, hasKeyframe.value)[this.state.selectedCoordinate]
|
|
|
|
+ : currentValue ?? 0;
|
|
const keyframe: IAnimationKey = { frame, value };
|
|
const keyframe: IAnimationKey = { frame, value };
|
|
this.setState(
|
|
this.setState(
|
|
{
|
|
{
|
|
@@ -1599,7 +1711,10 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
};
|
|
};
|
|
|
|
|
|
calculateCurrentPointInCurve = (frame: number): number | undefined => {
|
|
calculateCurrentPointInCurve = (frame: number): number | undefined => {
|
|
- if (this.state.selectedPathData !== undefined && this.state.selectedPathData[this.state.selectedCoordinate] !== undefined) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ this.state.selectedPathData !== undefined &&
|
|
|
|
+ this.state.selectedPathData[this.state.selectedCoordinate] !== undefined
|
|
|
|
+ ) {
|
|
const selectedCurve = this.state.selectedPathData[this.state.selectedCoordinate].domCurve.current;
|
|
const selectedCurve = this.state.selectedPathData[this.state.selectedCoordinate].domCurve.current;
|
|
if (selectedCurve !== null) {
|
|
if (selectedCurve !== null) {
|
|
const curveLength = selectedCurve.getTotalLength();
|
|
const curveLength = selectedCurve.getTotalLength();
|
|
@@ -1608,7 +1723,10 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
const currentPointInCurve = selectedCurve.getPointAtLength(frameValue);
|
|
const currentPointInCurve = selectedCurve.getPointAtLength(frameValue);
|
|
const middle = this._heightScale / 2;
|
|
const middle = this._heightScale / 2;
|
|
|
|
|
|
- const offset = (currentPointInCurve?.y * this._heightScale - this._heightScale ** 2 / 2) / middle / this._heightScale;
|
|
|
|
|
|
+ const offset =
|
|
|
|
+ (currentPointInCurve?.y * this._heightScale - this._heightScale ** 2 / 2) /
|
|
|
|
+ middle /
|
|
|
|
+ this._heightScale;
|
|
|
|
|
|
const unit = Math.sign(offset);
|
|
const unit = Math.sign(offset);
|
|
const currentValue = unit === -1 ? Math.abs(offset + unit) : unit - offset;
|
|
const currentValue = unit === -1 ? Math.abs(offset + unit) : unit - offset;
|
|
@@ -1632,11 +1750,13 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
if (keyframe.value === null) {
|
|
if (keyframe.value === null) {
|
|
value = this.state.panningY;
|
|
value = this.state.panningY;
|
|
} else {
|
|
} else {
|
|
- value = this.getValueAsArray(this.state.selected.dataType, keyframe.value)[this.state.selectedCoordinate];
|
|
|
|
|
|
+ value = this.getValueAsArray(this.state.selected.dataType, keyframe.value)[
|
|
|
|
+ this.state.selectedCoordinate
|
|
|
|
+ ];
|
|
}
|
|
}
|
|
|
|
|
|
const valueScale = this._heightScale / this._scaleFactor;
|
|
const valueScale = this._heightScale / this._scaleFactor;
|
|
- const positionY = value === 0 ? 0 : valueScale - value * valueScale;
|
|
|
|
|
|
+ const positionY = value === 0 ? 50 : valueScale - value * valueScale;
|
|
|
|
|
|
this.setState({ panningX: positionX, panningY: positionY, repositionCanvas: true });
|
|
this.setState({ panningX: positionX, panningY: positionY, repositionCanvas: true });
|
|
}
|
|
}
|
|
@@ -1693,10 +1813,20 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
let firstFrame = keys[0].frame;
|
|
let firstFrame = keys[0].frame;
|
|
let LastFrame = this.state.selected.getHighestFrame();
|
|
let LastFrame = this.state.selected.getHighestFrame();
|
|
if (direction === 1) {
|
|
if (direction === 1) {
|
|
- this._mainAnimatable = this.props.scene.beginAnimation(target, firstFrame, LastFrame, this.state.isLooping);
|
|
|
|
|
|
+ this._mainAnimatable = this.props.scene.beginAnimation(
|
|
|
|
+ target,
|
|
|
|
+ firstFrame,
|
|
|
|
+ LastFrame,
|
|
|
|
+ this.state.isLooping
|
|
|
|
+ );
|
|
}
|
|
}
|
|
if (direction === -1) {
|
|
if (direction === -1) {
|
|
- this._mainAnimatable = this.props.scene.beginAnimation(target, LastFrame, firstFrame, this.state.isLooping);
|
|
|
|
|
|
+ this._mainAnimatable = this.props.scene.beginAnimation(
|
|
|
|
+ target,
|
|
|
|
+ LastFrame,
|
|
|
|
+ firstFrame,
|
|
|
|
+ this.state.isLooping
|
|
|
|
+ );
|
|
}
|
|
}
|
|
if (!this.state.isLooping && this._mainAnimatable) {
|
|
if (!this.state.isLooping && this._mainAnimatable) {
|
|
this._mainAnimatable.onAnimationEnd = () => this.playPause(0);
|
|
this._mainAnimatable.onAnimationEnd = () => this.playPause(0);
|
|
@@ -1806,7 +1936,11 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
render() {
|
|
render() {
|
|
return (
|
|
return (
|
|
<div ref={this._editor} id="animation-curve-editor">
|
|
<div ref={this._editor} id="animation-curve-editor">
|
|
- <Notification message={this.state.notification} open={this.state.notification !== "" ? true : false} close={this.clearNotification} />
|
|
|
|
|
|
+ <Notification
|
|
|
|
+ message={this.state.notification}
|
|
|
|
+ open={this.state.notification !== "" ? true : false}
|
|
|
|
+ close={this.clearNotification}
|
|
|
|
+ />
|
|
<GraphActionsBar
|
|
<GraphActionsBar
|
|
setKeyframeValue={this.setKeyframeValueFromInput}
|
|
setKeyframeValue={this.setKeyframeValueFromInput}
|
|
enabled={this.state.selected === null || this.state.selected === undefined ? false : true}
|
|
enabled={this.state.selected === null || this.state.selected === undefined ? false : true}
|
|
@@ -1880,7 +2014,15 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
})}
|
|
})}
|
|
|
|
|
|
{this.setValueLines(this.state.valueScale).map((line, i) => {
|
|
{this.setValueLines(this.state.valueScale).map((line, i) => {
|
|
- return <line key={i} x1={-((this.state.frameAxisLength.length * 10) / 2)} y1={line.value} x2={this.state.frameAxisLength.length * 10} y2={line.value}></line>;
|
|
|
|
|
|
+ return (
|
|
|
|
+ <line
|
|
|
|
+ key={i}
|
|
|
|
+ x1={-((this.state.frameAxisLength.length * 10) / 2)}
|
|
|
|
+ y1={line.value}
|
|
|
|
+ x2={this.state.frameAxisLength.length * 10}
|
|
|
|
+ y2={line.value}
|
|
|
|
+ ></line>
|
|
|
|
+ );
|
|
})}
|
|
})}
|
|
|
|
|
|
{/* Multiple Curves */}
|
|
{/* Multiple Curves */}
|
|
@@ -1914,16 +2056,36 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
/>
|
|
/>
|
|
))}
|
|
))}
|
|
|
|
|
|
- <rect onClick={(e) => this.moveFrameTo(e)} x={-((this.state.frameAxisLength.length * 10) / 2)} y={91 + this.state.panningY + "%"} width={this.state.frameAxisLength.length * 10} height="9%" fill="#222" style={{ cursor: "pointer" }}></rect>
|
|
|
|
|
|
+ <rect
|
|
|
|
+ onClick={(e) => this.moveFrameTo(e)}
|
|
|
|
+ x={-((this.state.frameAxisLength.length * 10) / 2)}
|
|
|
|
+ y={91 + this.state.panningY + "%"}
|
|
|
|
+ width={this.state.frameAxisLength.length * 10}
|
|
|
|
+ height="9%"
|
|
|
|
+ fill="#222"
|
|
|
|
+ style={{ cursor: "pointer" }}
|
|
|
|
+ ></rect>
|
|
|
|
|
|
{this.state.frameAxisLength.map((f, i) => (
|
|
{this.state.frameAxisLength.map((f, i) => (
|
|
<svg key={i} x="0" y={96 + this.state.panningY + "%"} className="frame-contain">
|
|
<svg key={i} x="0" y={96 + this.state.panningY + "%"} className="frame-contain">
|
|
- <text x={f.value} y="1px" dx="2px" style={{ fontSize: `${0.2 * this.state.scale}em` }}>
|
|
|
|
|
|
+ <text
|
|
|
|
+ x={f.value}
|
|
|
|
+ y="1px"
|
|
|
|
+ dx="2px"
|
|
|
|
+ style={{ fontSize: `${0.2 * this.state.scale}em` }}
|
|
|
|
+ >
|
|
{f.label}
|
|
{f.label}
|
|
</text>
|
|
</text>
|
|
<line x1={f.value} y1="0" x2={f.value} y2="5%"></line>
|
|
<line x1={f.value} y1="0" x2={f.value} y2="5%"></line>
|
|
|
|
|
|
- {f.value % this.state.fps === 0 && f.value !== 0 ? <line x1={f.value * this._pixelFrameUnit} y1="-100%" x2={f.value * this._pixelFrameUnit} y2="5%"></line> : null}
|
|
|
|
|
|
+ {f.value % this.state.fps === 0 && f.value !== 0 ? (
|
|
|
|
+ <line
|
|
|
|
+ x1={f.value * this._pixelFrameUnit}
|
|
|
|
+ y1="-100%"
|
|
|
|
+ x2={f.value * this._pixelFrameUnit}
|
|
|
|
+ y2="5%"
|
|
|
|
+ ></line>
|
|
|
|
+ ) : null}
|
|
|
|
|
|
{this.state.selected && this.isCurrentFrame(f.label) ? (
|
|
{this.state.selected && this.isCurrentFrame(f.label) ? (
|
|
<svg>
|
|
<svg>
|
|
@@ -1938,7 +2100,13 @@ export class AnimationCurveEditorComponent extends React.Component<
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|
|
<svg x={f.value} y="-1">
|
|
<svg x={f.value} y="-1">
|
|
- <circle className="svg-playhead" cx="0" cy="0" r="2%" fill="white" />
|
|
|
|
|
|
+ <circle
|
|
|
|
+ className="svg-playhead"
|
|
|
|
+ cx="0"
|
|
|
|
+ cy="0"
|
|
|
|
+ r="2%"
|
|
|
|
+ fill="white"
|
|
|
|
+ />
|
|
<text
|
|
<text
|
|
x="0"
|
|
x="0"
|
|
y="1%"
|
|
y="1%"
|