From 9c4fdec38d62b3d2636fa2278ce0443488612e21 Mon Sep 17 00:00:00 2001
From: Isaac <>
Date: Sat, 18 May 2024 17:51:59 +0400
Subject: [PATCH] Refactoring

---
 .../Sources/ViewController.swift              |  2 +-
 .../PublicHeaders/LottieCpp/Vectors.h         | 28 +++++++++----------
 .../CompLayers/ShapeUtils/BezierPathUtils.cpp |  2 +-
 .../Public/Keyframes/ValueInterpolators.cpp   |  5 ++--
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Tests/LottieMetalTest/Sources/ViewController.swift b/Tests/LottieMetalTest/Sources/ViewController.swift
index ff9c7fe159..f4ca69a3c5 100644
--- a/Tests/LottieMetalTest/Sources/ViewController.swift
+++ b/Tests/LottieMetalTest/Sources/ViewController.swift
@@ -119,7 +119,7 @@ public final class ViewController: UIViewController {
         
         self.view.layer.addSublayer(MetalEngine.shared.rootLayer)
         
-        if !"".isEmpty {
+        if "".isEmpty {
             if #available(iOS 13.0, *) {
                 self.test = ReferenceCompareTest(view: self.view)
             }
diff --git a/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h b/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h
index 19105a01dc..006c40917e 100644
--- a/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h
+++ b/submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/Vectors.h
@@ -16,16 +16,16 @@ struct Vector1D {
         Array
     };
     
-    explicit Vector1D(double value_) :
+    explicit Vector1D(float value_) :
     value(value_) {
     }
     
     explicit Vector1D(lottiejson11::Json const &json) noexcept(false);
     lottiejson11::Json toJson() const;
     
-    double value;
+    float value;
     
-    double distanceTo(Vector1D const &to) const {
+    float distanceTo(Vector1D const &to) const {
         return abs(to.value - value);
     }
 };
@@ -48,7 +48,7 @@ struct __attribute__((packed)) Vector2D {
     y(0.0) {
     }
     
-    explicit Vector2D(double x_, double y_) :
+    explicit Vector2D(float x_, float y_) :
     x(x_),
     y(y_) {
     }
@@ -56,8 +56,8 @@ struct __attribute__((packed)) Vector2D {
     explicit Vector2D(lottiejson11::Json const &json) noexcept(false);
     lottiejson11::Json toJson() const;
     
-    double x;
-    double y;
+    float x;
+    float y;
     
     Vector2D operator+(Vector2D const &rhs) const {
         return Vector2D(x + rhs.x, y + rhs.y);
@@ -67,7 +67,7 @@ struct __attribute__((packed)) Vector2D {
         return Vector2D(x - rhs.x, y - rhs.y);
     }
     
-    Vector2D operator*(double scalar) const {
+    Vector2D operator*(float scalar) const {
         return Vector2D(x * scalar, y * scalar);
     }
     
@@ -83,15 +83,15 @@ struct __attribute__((packed)) Vector2D {
         return x == 0.0 && y == 0.0;
     }
     
-    double distanceTo(Vector2D const &to) const {
+    float distanceTo(Vector2D const &to) const {
         auto deltaX = to.x - x;
         auto deltaY = to.y - y;
         return sqrt(deltaX * deltaX + deltaY * deltaY);
     }
     
     bool colinear(Vector2D const &a, Vector2D const &b) const {
-        double area = x * (a.y - b.y) + a.x * (b.y - y) + b.x * (y - a.y);
-        double accuracy = 0.05;
+        float area = x * (a.y - b.y) + a.x * (b.y - y) + b.x * (y - a.y);
+        float accuracy = 0.05;
         if (area < accuracy && area > -accuracy) {
             return true;
         }
@@ -120,7 +120,7 @@ Vector2D interpolate(
 );
 
 struct Vector3D {
-    explicit Vector3D(double x_, double y_, double z_) :
+    explicit Vector3D(float x_, float y_, float z_) :
     x(x_),
     y(y_),
     z(z_) {
@@ -129,9 +129,9 @@ struct Vector3D {
     explicit Vector3D(lottiejson11::Json const &json) noexcept(false);
     lottiejson11::Json toJson() const;
     
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
+    float x = 0.0;
+    float y = 0.0;
+    float z = 0.0;
 };
 
 Vector3D interpolate(
diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeUtils/BezierPathUtils.cpp b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeUtils/BezierPathUtils.cpp
index cd129d2606..a94aec3081 100644
--- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeUtils/BezierPathUtils.cpp
+++ b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeUtils/BezierPathUtils.cpp
@@ -57,7 +57,7 @@ BezierPath makeRectangleBezierPath(
     const double ControlPointConstant = 0.55228;
     
     Vector2D size = inputSize * 0.5;
-    double radius = std::min(std::min(cornerRadius, size.x), size.y);
+    double radius = std::min(std::min(cornerRadius, (double)size.x), (double)size.y);
     
     BezierPath bezierPath;
     std::vector<CurveVertex> points;
diff --git a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Keyframes/ValueInterpolators.cpp b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Keyframes/ValueInterpolators.cpp
index 6e91c29572..7a92fd80ba 100644
--- a/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Keyframes/ValueInterpolators.cpp
+++ b/submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Public/Keyframes/ValueInterpolators.cpp
@@ -10,10 +10,11 @@ void batchInterpolate(std::vector<PathElement> const &from, std::vector<PathElem
         elementCount = (int)to.size();
     }
     
-    static_assert(sizeof(PathElement) == 8 * 2 * 3);
+    static_assert(sizeof(PathElement) == 4 * 2 * 3);
     
     resultPath.setElementCount(elementCount);
-    vDSP_vintbD((double *)&from[0], 1, (double *)&to[0], 1, &amount, (double *)&resultPath.elements()[0], 1, elementCount * 2 * 3);
+    float floatAmount = (float)amount;
+    vDSP_vintb((float *)&from[0], 1, (float *)&to[0], 1, &floatAmount, (float *)&resultPath.elements()[0], 1, elementCount * 2 * 3);
 }
 
 }