Browse Source

Renamed BezierTo and QuadTo method names

pull/308/head
Wiesław Šoltés 11 years ago
parent
commit
6583019576
  1. 6
      src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
  2. 8
      src/Perspex.SceneGraph/Media/EllipseGeometry.cs
  3. 2
      src/Perspex.SceneGraph/Media/PathMarkupParser.cs
  4. 8
      src/Perspex.SceneGraph/Media/StreamGeometryContext.cs
  5. 4
      src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs
  6. 4
      src/Shared/RenderHelpers/ArcToHelper.cs
  7. 4
      src/Shared/RenderHelpers/QuadBezierHelper.cs
  8. 4
      src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs

6
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;
}
}

8
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);
}

2
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;
}

8
src/Perspex.SceneGraph/Media/StreamGeometryContext.cs

@ -59,9 +59,9 @@ namespace Perspex.Media
/// <param name="point1">The first control point used to specify the shape of the curve.</param>
/// <param name="point2">The second control point used to specify the shape of the curve.</param>
/// <param name="point3">The destination point for the end of the curve.</param>
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);
}
/// <summary>
@ -69,9 +69,9 @@ namespace Perspex.Media
/// </summary>
/// <param name="control">The control point used to specify the shape of the curve.</param>
/// <param name="endPoint">The destination point for the end of the curve.</param>
public void QuadTo(Point control, Point endPoint)
public void QuadraticBezierTo(Point control, Point endPoint)
{
_impl.QuadTo(control, endPoint);
_impl.QuadraticBezierTo(control, endPoint);
}
/// <summary>

4
src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs

@ -36,14 +36,14 @@ namespace Perspex.Platform
/// <param name="point1">The first control point used to specify the shape of the curve.</param>
/// <param name="point2">The second control point used to specify the shape of the curve.</param>
/// <param name="point3">The destination point for the end of the curve.</param>
void BezierTo(Point point1, Point point2, Point point3);
void CubicBezierTo(Point point1, Point point2, Point point3);
/// <summary>
/// Draws a quadratic Bezier curve to the specified point
/// </summary>
/// <param name="control">Control point</param>
/// <param name="endPoint">DestinationPoint</param>
void QuadTo(Point control, Point endPoint);
void QuadraticBezierTo(Point control, Point endPoint);
/// <summary>
/// Draws a line to the specified point.

4
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)

4
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);
}
}
}

4
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
{

Loading…
Cancel
Save