tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix typos in Matrix.cs

pull/8296/head
Takoooooo 4 years ago
parent
478c4f3884
commit
e2e5a75255
1 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/Avalonia.Base/Matrix.cs

72
src/Avalonia.Base/Matrix.cs
View File

@ -9,14 +9,14 @@ namespace Avalonia
/// <summary> /// <summary>
/// A 3x3 matrix. /// A 3x3 matrix.
/// </summary> /// </summary>
/// <remakrs>Matrix layout: /// <remarks>Matrix layout:
/// | 1st col | 2nd col | 3r col | /// | 1st col | 2nd col | 3r col |
/// 1st row | scaleX | skrewY | persX | /// 1st row | scaleX | skewY | perspX |
/// 2nd row | skrewX | scaleY | persY | /// 2nd row | skewX | scaleY | perspY |
/// 3rd row | transX | transY | persZ | /// 3rd row | transX | transY | perspZ |
/// ///
/// Note: Skia.SkMatrix uses a transposed layout (where for example skrewX/skrewY and perspp0/tranX are swapped). /// Note: Skia.SkMatrix uses a transposed layout (where for example skewX/skewY and persp0/transX are swapped).
/// </remakrs> /// </remarks>
#if !BUILDTASK #if !BUILDTASK
public public
#endif #endif
@ -36,18 +36,18 @@ namespace Avalonia
/// Initializes a new instance of the <see cref="Matrix"/> struct (equivalent to a 2x3 Matrix without perspective). /// Initializes a new instance of the <see cref="Matrix"/> struct (equivalent to a 2x3 Matrix without perspective).
/// </summary> /// </summary>
/// <param name="scaleX">The first element of the first row.</param> /// <param name="scaleX">The first element of the first row.</param>
/// <param name="skrewY">The second element of the first row.</param> /// <param name="skewY">The second element of the first row.</param>
/// <param name="skrewX">The first element of the second row.</param> /// <param name="skewX">The first element of the second row.</param>
/// <param name="scaleY">The second element of the second row.</param> /// <param name="scaleY">The second element of the second row.</param>
/// <param name="offsetX">The first element of the third row.</param> /// <param name="offsetX">The first element of the third row.</param>
/// <param name="offsetY">The second element of the third row.</param> /// <param name="offsetY">The second element of the third row.</param>
public Matrix( public Matrix(
double scaleX, double scaleX,
double skrewY, double skewY,
double skrewX, double skewX,
double scaleY, double scaleY,
double offsetX, double offsetX,
double offsetY) : this( scaleX, skrewY, 0, skrewX, scaleY, 0, offsetX, offsetY, 1) double offsetY) : this( scaleX, skewY, 0, skewX, scaleY, 0, offsetX, offsetY, 1)
{ {
} }
@ -57,34 +57,34 @@ namespace Avalonia
/// Initializes a new instance of the <see cref="Matrix"/> struct. /// Initializes a new instance of the <see cref="Matrix"/> struct.
/// </summary> /// </summary>
/// <param name="scaleX">The first element of the first row.</param> /// <param name="scaleX">The first element of the first row.</param>
/// <param name="skrewY">The second element of the first row.</param> /// <param name="skewY">The second element of the first row.</param>
/// <param name="persX">The third element of the first row.</param> /// <param name="perspX">The third element of the first row.</param>
/// <param name="skrewX">The first element of the second row.</param> /// <param name="skewX">The first element of the second row.</param>
/// <param name="scaleY">The second element of the second row.</param> /// <param name="scaleY">The second element of the second row.</param>
/// <param name="persY">The third element of the second row.</param> /// <param name="perspY">The third element of the second row.</param>
/// <param name="offsetX">The first element of the third row.</param> /// <param name="offsetX">The first element of the third row.</param>
/// <param name="offsetY">The second element of the third row.</param> /// <param name="offsetY">The second element of the third row.</param>
/// <param name="persZ">The third element of the third row.</param> /// <param name="perspZ">The third element of the third row.</param>
public Matrix( public Matrix(
double scaleX, double scaleX,
double skrewY, double skewY,
double persX, double perspX,
double skrewX, double skewX,
double scaleY, double scaleY,
double persY, double perspY,
double offsetX, double offsetX,
double offsetY, double offsetY,
double persZ) double perspZ)
{ {
_m11 = scaleX; _m11 = scaleX;
_m12 = skrewY; _m12 = skewY;
_m13 = persX; _m13 = perspX;
_m21 = skrewX; _m21 = skewX;
_m22 = scaleY; _m22 = scaleY;
_m23 = persY; _m23 = perspY;
_m31 = offsetX; _m31 = offsetX;
_m32 = offsetY; _m32 = offsetY;
_m33 = persZ; _m33 = perspZ;
} }
/// <summary> /// <summary>
@ -111,17 +111,17 @@ namespace Avalonia
public double M11 => _m11; public double M11 => _m11;
/// <summary> /// <summary>
/// The second element of the first row (skrewY). /// The second element of the first row (skewY).
/// </summary> /// </summary>
public double M12 => _m12; public double M12 => _m12;
/// <summary> /// <summary>
/// The third element of the first row (persX: input x-axis perspective factor). /// The third element of the first row (perspX: input x-axis perspective factor).
/// </summary> /// </summary>
public double M13 => _m13; public double M13 => _m13;
/// <summary> /// <summary>
/// The first element of the second row (skrewX). /// The first element of the second row (skewX).
/// </summary> /// </summary>
public double M21 => _m21; public double M21 => _m21;
@ -131,7 +131,7 @@ namespace Avalonia
public double M22 => _m22; public double M22 => _m22;
/// <summary> /// <summary>
/// The third element of the second row (persY: input y-axis perspective factor). /// The third element of the second row (perspY: input y-axis perspective factor).
/// </summary> /// </summary>
public double M23 => _m23; public double M23 => _m23;
@ -146,7 +146,7 @@ namespace Avalonia
public double M32 => _m32; public double M32 => _m32;
/// <summary> /// <summary>
/// The third element of the third row (persZ: perspective scale factor). /// The third element of the third row (perspZ: perspective scale factor).
/// </summary> /// </summary>
public double M33 => _m33; public double M33 => _m33;
@ -481,7 +481,7 @@ namespace Avalonia
/// <summary> /// <summary>
/// Parses a <see cref="Matrix"/> string. /// Parses a <see cref="Matrix"/> string.
/// </summary> /// </summary>
/// <param name="s">Six or nine comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY[, persX, persY, persZ]) that describe the new <see cref="Matrix"/></param> /// <param name="s">Six or nine comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY[, perspX, perspY, perspZ]) that describe the new <see cref="Matrix"/></param>
/// <returns>The <see cref="Matrix"/>.</returns> /// <returns>The <see cref="Matrix"/>.</returns>
public static Matrix Parse(string s) public static Matrix Parse(string s)
{ {
@ -497,11 +497,11 @@ namespace Avalonia
var v4 = tokenizer.ReadDouble(); var v4 = tokenizer.ReadDouble();
var v5 = tokenizer.ReadDouble(); var v5 = tokenizer.ReadDouble();
var v6 = tokenizer.ReadDouble(); var v6 = tokenizer.ReadDouble();
var pers = tokenizer.TryReadDouble(out var v7); var persp = tokenizer.TryReadDouble(out var v7);
pers = pers && tokenizer.TryReadDouble(out v8); persp = persp && tokenizer.TryReadDouble(out v8);
pers = pers && tokenizer.TryReadDouble(out v9); persp = persp && tokenizer.TryReadDouble(out v9);
if (pers) if (persp)
return new Matrix(v1, v2, v7, v3, v4, v8, v5, v6, v9); return new Matrix(v1, v2, v7, v3, v4, v8, v5, v6, v9);
else else
return new Matrix(v1, v2, v3, v4, v5, v6); return new Matrix(v1, v2, v3, v4, v5, v6);

Write Preview
Loading…
Cancel
Save