Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert D21587648: LayoutImplementations: implement all existing animation curves besides Keyboard

Browse Source 
Differential Revision:
D21587648

Original commit changeset: 246ab7fd4039

fbshipit-source-id: 427e13ff821776feb4952c3438c15ea815fce5f0
This commit is contained in:
Ishan Khot
2020-05-20 16:34:29 -07:00
committed by Facebook GitHub Bot
parent 5ae7e4fee2
commit 6a15d7487f
2 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactCommon/fabric/animations/BUCK
-1
View File
@@ -36,7 +36,6 @@ rn_xplat_cxx_library(
"-frtti",
"-std=c++14",
"-Wall",
"-lm",
],
fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.cpp
+8 -45
View File
@@ -105,7 +105,7 @@ static better::optional<AnimationConfig> parseAnimationConfig(
double duration = defaultDuration;
double delay = 0;
double springDamping = 0.5;
double springDamping = 0;
double initialVelocity = 0;
auto const durationIt = config.find("duration");
@@ -236,50 +236,13 @@ LayoutAnimationKeyFrameManager::calculateAnimationProgress(
uint64_t startTime = animation.startTime;
uint64_t delay = mutationConfig.delay;
uint64_t endTime = startTime + delay + mutationConfig.duration;
static const float PI = 3.14159265358979323846;
if (now >= endTime) {
return {1, 1};
}
if (now < startTime + delay) {
return {0, 0};
}
double linearTimeProgression = 1 -
(double)(endTime - delay - now) / (double)(endTime - animation.startTime);
if (mutationConfig.animationType == AnimationType::Linear) {
return {linearTimeProgression, linearTimeProgression};
} else if (mutationConfig.animationType == AnimationType::EaseIn) {
// This is an accelerator-style interpolator.
// In the future, this parameter (2.0) could be adjusted. This has been the
// default for Classic RN forever.
return {linearTimeProgression, pow(linearTimeProgression, 2.0)};
} else if (mutationConfig.animationType == AnimationType::EaseOut) {
// This is an decelerator-style interpolator.
// In the future, this parameter (2.0) could be adjusted. This has been the
// default for Classic RN forever.
return {linearTimeProgression, 1.0 - pow(1 - linearTimeProgression, 2.0)};
} else if (mutationConfig.animationType == AnimationType::EaseInEaseOut) {
// This is a combination of accelerate+decelerate.
// The animation starts and ends slowly, and speeds up in the middle.
return {linearTimeProgression,
cos((linearTimeProgression + 1.0) * PI) / 2 + 0.5};
} else if (mutationConfig.animationType == AnimationType::Spring) {
// Using mSpringDamping in this equation is not really the exact
// mathematical springDamping, but a good approximation We need to replace
// this equation with the right Factor that accounts for damping and
// friction
double damping = mutationConfig.springDamping;
return {
linearTimeProgression,
(1 +
pow(2, -10 * linearTimeProgression) *
sin((linearTimeProgression - damping / 4) * PI * 2 / damping))};
} else {
return {linearTimeProgression, linearTimeProgression};
}
double progress = (now >= endTime)
? 1
: ((now < startTime + delay) ? 0
: 1 -
(double)(endTime - delay - now) /
(double)(endTime - animation.startTime));
return {progress, progress};
}
void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(