1 files changed, 41 insertions, 11 deletions

diff --git a/src/platform/graphics/quartz/Geometry.cpp b/src/platform/graphics/quartz/Geometry.cpp
index 4c2f90a6..5335d3f6 100644
--- a/src/platform/graphics/quartz/Geometry.cpp
+++ b/src/platform/graphics/quartz/Geometry.cpp
@@ -1,15 +1,17 @@
 #include "cru/platform/graphics/quartz/Geometry.h"
 
+#include <cstdlib>
 #include <memory>
+#include "cru/base/log/Logger.h"
 
 namespace cru::platform::graphics::quartz {
-QuartzGeometry::QuartzGeometry(IGraphicsFactory *graphics_factory,
+QuartzGeometry::QuartzGeometry(IGraphicsFactory* graphics_factory,
                                CGPathRef cg_path)
     : OsxQuartzResource(graphics_factory), cg_path_(cg_path) {}
 
 QuartzGeometry::~QuartzGeometry() { CGPathRelease(cg_path_); }
 
-bool QuartzGeometry::FillContains(const Point &point) {
+bool QuartzGeometry::FillContains(const Point& point) {
   return CGPathContainsPoint(cg_path_, nullptr, CGPoint{point.x, point.y},
                              kCGPathFill);
 }
@@ -20,7 +22,7 @@ Rect QuartzGeometry::GetBounds() {
   return Convert(bounds);
 }
 
-std::unique_ptr<IGeometry> QuartzGeometry::Transform(const Matrix &matrix) {
+std::unique_ptr<IGeometry> QuartzGeometry::Transform(const Matrix& matrix) {
   auto cg_matrix = Convert(matrix);
   auto cg_path = CGPathCreateCopyByTransformingPath(cg_path_, &cg_matrix);
   return std::make_unique<QuartzGeometry>(GetGraphicsFactory(), cg_path);
@@ -32,7 +34,7 @@ std::unique_ptr<IGeometry> QuartzGeometry::CreateStrokeGeometry(float width) {
   return std::make_unique<QuartzGeometry>(GetGraphicsFactory(), cg_path);
 }
 
-QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphicsFactory *graphics_factory)
+QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphicsFactory* graphics_factory)
     : OsxQuartzResource(graphics_factory) {
   cg_mutable_path_ = CGPathCreateMutable();
 }
@@ -45,28 +47,56 @@ Point QuartzGeometryBuilder::GetCurrentPosition() {
   return Convert(CGPathGetCurrentPoint(cg_mutable_path_));
 }
 
-void QuartzGeometryBuilder::MoveTo(const Point &point) {
+void QuartzGeometryBuilder::MoveTo(const Point& point) {
   CGPathMoveToPoint(cg_mutable_path_, nullptr, point.x, point.y);
 }
 
-void QuartzGeometryBuilder::LineTo(const Point &point) {
+void QuartzGeometryBuilder::LineTo(const Point& point) {
   CGPathAddLineToPoint(cg_mutable_path_, nullptr, point.x, point.y);
 }
 
-void QuartzGeometryBuilder::CubicBezierTo(const Point &start_control_point,
-                                          const Point &end_control_point,
-                                          const Point &end_point) {
+void QuartzGeometryBuilder::CubicBezierTo(const Point& start_control_point,
+                                          const Point& end_control_point,
+                                          const Point& end_point) {
   CGPathAddCurveToPoint(cg_mutable_path_, nullptr, start_control_point.x,
                         start_control_point.y, end_control_point.x,
                         end_control_point.y, end_point.x, end_point.y);
 }
 
-void QuartzGeometryBuilder::QuadraticBezierTo(const Point &control_point,
-                                              const Point &end_point) {
+void QuartzGeometryBuilder::QuadraticBezierTo(const Point& control_point,
+                                              const Point& end_point) {
   CGPathAddQuadCurveToPoint(cg_mutable_path_, nullptr, control_point.x,
                             control_point.y, end_point.x, end_point.y);
 }
 
+namespace {
+bool Near(const Point& p1, const Point& p2) {
+  return std::abs(p1.x - p2.x) < 0.0001 && std::abs(p1.y - p2.y) < 0.0001;
+}
+}  // namespace
+
+void QuartzGeometryBuilder::ArcTo(const Point& radius, float angle,
+                                  bool is_large_arc, bool is_clockwise,
+                                  const Point& end_point) {
+  auto pos = GetCurrentPosition();
+  auto info = CalculateArcInfo(pos, radius, angle, is_large_arc, is_clockwise,
+                               end_point);
+  CruLogDebug(
+      kLogTag,
+      "Arc to {}, radius {}, angle {}, is_large_arc {}, is_clockwise {}, "
+      "end_point {}. Calculated, center {}, start_angle {}, end_angle {}.",
+      pos, radius, angle, is_large_arc, is_clockwise, end_point, info.center,
+      info.start_angle, info.end_angle);
+
+  auto matrix = Matrix::Scale(radius.x, radius.y);
+  CGAffineTransform transform = Convert(matrix);
+
+  CGPathAddArc(cg_mutable_path_, &transform, info.center.x, info.center.y, 1,
+               info.start_angle, info.end_angle, true);
+
+  assert(Near(GetCurrentPosition(), end_point));
+}
+
 void QuartzGeometryBuilder::CloseFigure(bool close) {
   if (close) CGPathCloseSubpath(cg_mutable_path_);
 }