From 65830195765fe812eba7dbbb050c7d08a3ef9979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 5 Nov 2015 18:39:49 +0100 Subject: [PATCH] Renamed BezierTo and QuadTo method names --- src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs | 6 +++--- src/Perspex.SceneGraph/Media/EllipseGeometry.cs | 8 ++++---- src/Perspex.SceneGraph/Media/PathMarkupParser.cs | 2 +- src/Perspex.SceneGraph/Media/StreamGeometryContext.cs | 8 ++++---- .../Platform/IStreamGeometryContextImpl.cs | 4 ++-- src/Shared/RenderHelpers/ArcToHelper.cs | 4 ++-- src/Shared/RenderHelpers/QuadBezierHelper.cs | 4 ++-- .../Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs b/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs index 5e3e279deb..2c5cce2653 100644 --- a/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs +++ b/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs @@ -42,7 +42,7 @@ namespace Perspex.Cairo.Media } } - public void BezierTo(Point point1, Point point2, Point point3) + public void CubicBezierTo(Point point1, Point point2, Point point3) { if (this.Path == null) { @@ -51,11 +51,11 @@ namespace Perspex.Cairo.Media } } - public void QuadTo(Point control, Point endPoint) + public void QuadraticBezierTo(Point control, Point endPoint) { if (this.Path == null) { - QuadBezierHelper.QuadTo(this, _currentPoint, control, endPoint); + QuadBezierHelper.QuadraticBezierTo(this, _currentPoint, control, endPoint); _currentPoint = endPoint; } } diff --git a/src/Perspex.SceneGraph/Media/EllipseGeometry.cs b/src/Perspex.SceneGraph/Media/EllipseGeometry.cs index d8887ac035..3d6ae38909 100644 --- a/src/Perspex.SceneGraph/Media/EllipseGeometry.cs +++ b/src/Perspex.SceneGraph/Media/EllipseGeometry.cs @@ -39,10 +39,10 @@ namespace Perspex.Media var y4 = center.Y + radius.Y; ctx.BeginFigure(new Point(x2, y0), true); - ctx.BezierTo(new Point(x3, y0), new Point(x4, y1), new Point(x4, y2)); - ctx.BezierTo(new Point(x4, y3), new Point(x3, y4), new Point(x2, y4)); - ctx.BezierTo(new Point(x1, y4), new Point(x0, y3), new Point(x0, y2)); - ctx.BezierTo(new Point(x0, y1), new Point(x1, y0), new Point(x2, y0)); + ctx.CubicBezierTo(new Point(x3, y0), new Point(x4, y1), new Point(x4, y2)); + ctx.CubicBezierTo(new Point(x4, y3), new Point(x3, y4), new Point(x2, y4)); + ctx.CubicBezierTo(new Point(x1, y4), new Point(x0, y3), new Point(x0, y2)); + ctx.CubicBezierTo(new Point(x0, y1), new Point(x1, y0), new Point(x2, y0)); ctx.EndFigure(true); } diff --git a/src/Perspex.SceneGraph/Media/PathMarkupParser.cs b/src/Perspex.SceneGraph/Media/PathMarkupParser.cs index e02f65caba..b8b7d592e7 100644 --- a/src/Perspex.SceneGraph/Media/PathMarkupParser.cs +++ b/src/Perspex.SceneGraph/Media/PathMarkupParser.cs @@ -146,7 +146,7 @@ namespace Perspex.Media Point point1 = ReadPoint(reader); Point point2 = ReadPoint(reader); point = ReadPoint(reader); - _context.BezierTo(point1, point2, point); + _context.CubicBezierTo(point1, point2, point); break; } diff --git a/src/Perspex.SceneGraph/Media/StreamGeometryContext.cs b/src/Perspex.SceneGraph/Media/StreamGeometryContext.cs index 0d0c345389..dcb000544f 100644 --- a/src/Perspex.SceneGraph/Media/StreamGeometryContext.cs +++ b/src/Perspex.SceneGraph/Media/StreamGeometryContext.cs @@ -59,9 +59,9 @@ namespace Perspex.Media /// The first control point used to specify the shape of the curve. /// The second control point used to specify the shape of the curve. /// The destination point for the end of the curve. - public void BezierTo(Point point1, Point point2, Point point3) + public void CubicBezierTo(Point point1, Point point2, Point point3) { - _impl.BezierTo(point1, point2, point3); + _impl.CubicBezierTo(point1, point2, point3); } /// @@ -69,9 +69,9 @@ namespace Perspex.Media /// /// The control point used to specify the shape of the curve. /// The destination point for the end of the curve. - public void QuadTo(Point control, Point endPoint) + public void QuadraticBezierTo(Point control, Point endPoint) { - _impl.QuadTo(control, endPoint); + _impl.QuadraticBezierTo(control, endPoint); } /// diff --git a/src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs b/src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs index 88a5d0a7b9..182a3ec174 100644 --- a/src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs +++ b/src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs @@ -36,14 +36,14 @@ namespace Perspex.Platform /// The first control point used to specify the shape of the curve. /// The second control point used to specify the shape of the curve. /// The destination point for the end of the curve. - void BezierTo(Point point1, Point point2, Point point3); + void CubicBezierTo(Point point1, Point point2, Point point3); /// /// Draws a quadratic Bezier curve to the specified point /// /// Control point /// DestinationPoint - void QuadTo(Point control, Point endPoint); + void QuadraticBezierTo(Point control, Point endPoint); /// /// Draws a line to the specified point. diff --git a/src/Shared/RenderHelpers/ArcToHelper.cs b/src/Shared/RenderHelpers/ArcToHelper.cs index a708c09ee2..5c129a8c91 100644 --- a/src/Shared/RenderHelpers/ArcToHelper.cs +++ b/src/Shared/RenderHelpers/ArcToHelper.cs @@ -949,11 +949,11 @@ namespace Perspex.RenderHelpers else if (degree == 2) { double k = (yBDot * (xB - xA) - xBDot * (yB - yA)) / (xADot * yBDot - yADot * xBDot); - path.QuadTo(new Point(xA + k * xADot, yA + k * yADot), new Point(xB, yB)); + path.QuadraticBezierTo(new Point(xA + k * xADot, yA + k * yADot), new Point(xB, yB)); } else { - path.BezierTo( + path.CubicBezierTo( new Point(xA + alpha * xADot, yA + alpha * yADot), new Point(xB - alpha * xBDot, yB - alpha * yBDot), new Point(xB, yB) diff --git a/src/Shared/RenderHelpers/QuadBezierHelper.cs b/src/Shared/RenderHelpers/QuadBezierHelper.cs index 8c6c9f3d63..33b5042de7 100644 --- a/src/Shared/RenderHelpers/QuadBezierHelper.cs +++ b/src/Shared/RenderHelpers/QuadBezierHelper.cs @@ -4,10 +4,10 @@ namespace Perspex.RenderHelpers { static class QuadBezierHelper { - public static void QuadTo(IStreamGeometryContextImpl context, Point current, Point controlPoint, Point endPoint) + public static void QuadraticBezierTo(IStreamGeometryContextImpl context, Point current, Point controlPoint, Point endPoint) { //(s, (s + 2c)/ 3, (e + 2c)/ 3, e) - context.BezierTo((current + 2*controlPoint)/3, (endPoint + 2*controlPoint)/3, endPoint); + context.CubicBezierTo((current + 2*controlPoint)/3, (endPoint + 2*controlPoint)/3, endPoint); } } } diff --git a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs index bf72373423..e18e61f94a 100644 --- a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs @@ -37,7 +37,7 @@ namespace Perspex.Direct2D1.Media _sink.BeginFigure(startPoint.ToSharpDX(), isFilled ? FigureBegin.Filled : FigureBegin.Hollow); } - public void BezierTo(Point point1, Point point2, Point point3) + public void CubicBezierTo(Point point1, Point point2, Point point3) { _sink.AddBezier(new BezierSegment { @@ -47,7 +47,7 @@ namespace Perspex.Direct2D1.Media }); } - public void QuadTo(Point control, Point dest) + public void QuadraticBezierTo(Point control, Point dest) { _sink.AddQuadraticBezier(new QuadraticBezierSegment {