From 6188ec971c150d5985ff21ff88af492f9f4dbdd2 Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Sat, 18 May 2024 18:25:36 +0400 Subject: [PATCH] Refactoring --- .../PublicHeaders/LottieCpp/Vectors.h | 12 ++++++------ .../Lottie/Public/Primitives/Vectors.mm | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h b/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h index f4498aad23..601bb3912a 100644 --- a/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h +++ b/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h @@ -35,7 +35,7 @@ float interpolate(float value, float to, float amount); Vector1D interpolate( Vector1D const &from, Vector1D const &to, - double amount + float amount ); struct __attribute__((packed)) Vector2D { @@ -100,23 +100,23 @@ struct __attribute__((packed)) Vector2D { Vector2D pointOnPath(Vector2D const &to, Vector2D const &outTangent, Vector2D const &inTangent, double amount) const; - Vector2D interpolate(Vector2D const &to, double amount) const; + Vector2D interpolate(Vector2D const &to, float amount) const; Vector2D interpolate( Vector2D const &to, Vector2D const &outTangent, Vector2D const &inTangent, - double amount, + float amount, int maxIterations = 3, int samples = 20, - double accuracy = 1.0 + float accuracy = 1.0 ) const; }; Vector2D interpolate( Vector2D const &from, Vector2D const &to, - double amount + float amount ); struct Vector3D { @@ -137,7 +137,7 @@ struct Vector3D { Vector3D interpolate( Vector3D const &from, Vector3D const &to, - double amount + float amount ); inline double degreesToRadians(double value) { diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Primitives/Vectors.mm b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Primitives/Vectors.mm index 005204843b..074c23fb35 100644 --- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Primitives/Vectors.mm +++ b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Primitives/Vectors.mm @@ -154,7 +154,7 @@ float interpolate(float value, float to, float amount) { Vector1D interpolate( Vector1D const &from, Vector1D const &to, - double amount + float amount ) { return Vector1D(interpolate(from.value, to.value, amount)); } @@ -162,7 +162,7 @@ Vector1D interpolate( Vector2D interpolate( Vector2D const &from, Vector2D const &to, - double amount + float amount ) { return Vector2D(interpolate(from.x, to.x, amount), interpolate(from.y, to.y, amount)); } @@ -171,7 +171,7 @@ Vector2D interpolate( Vector3D interpolate( Vector3D const &from, Vector3D const &to, - double amount + float amount ) { return Vector3D(interpolate(from.x, to.x, amount), interpolate(from.y, to.y, amount), interpolate(from.z, to.z, amount)); } @@ -289,7 +289,7 @@ struct InterpolationPoint2D { }; namespace { - double interpolateDouble(double value, double to, double amount) { + double interpolateFloat(float value, float to, float amount) { return value + ((to - value) * amount); } } @@ -304,10 +304,10 @@ Vector2D Vector2D::pointOnPath(Vector2D const &to, Vector2D const &outTangent, V return f; } -Vector2D Vector2D::interpolate(Vector2D const &to, double amount) const { +Vector2D Vector2D::interpolate(Vector2D const &to, float amount) const { return Vector2D( - interpolateDouble(x, to.x, amount), - interpolateDouble(y, to.y, amount) + interpolateFloat(x, to.x, amount), + interpolateFloat(y, to.y, amount) ); } @@ -315,10 +315,10 @@ Vector2D Vector2D::interpolate( Vector2D const &to, Vector2D const &outTangent, Vector2D const &inTangent, - double amount, + float amount, int maxIterations, int samples, - double accuracy + float accuracy ) const { if (amount == 0.0) { return *this;