-
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
D2D1: Svg improvements and remove some legacy code.
- Loading branch information
1 parent
a97d350
commit fc1540a
Showing
17 changed files
with
221 additions
and
280 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| // Copyright © Amer Koleci and Contributors. | ||
| // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. | ||
|
|
||
| using System.Collections; | ||
|
|
||
| namespace Vortice.Direct2D1; | ||
|
|
||
| public unsafe partial class ID2D1SvgElement : IEnumerable<ID2D1SvgElement> | ||
| { | ||
| public string TextValue | ||
| { | ||
| get | ||
| { | ||
| int length = GetTextValueLength(); | ||
| char* chars = stackalloc char[length + 1]; | ||
| GetTextValue(chars, length + 1).CheckError(); | ||
| return new string(chars, 0, length); | ||
| } | ||
| } | ||
|
|
||
| public string TagName | ||
| { | ||
| get | ||
| { | ||
| int length = GetTagNameLength(); | ||
| char* chars = stackalloc char[length + 1]; | ||
| GetTagName(chars, length + 1).CheckError(); | ||
| return new string(chars, 0, length); | ||
| } | ||
| } | ||
|
|
||
| public IEnumerator<ID2D1SvgElement> GetEnumerator() | ||
| { | ||
| ID2D1SvgElement? child = GetFirstChild(); | ||
| while (child != null) | ||
| { | ||
| yield return child; | ||
| child = child.GetNextChild(child); | ||
| } | ||
| } | ||
|
|
||
| IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); | ||
|
|
||
| public IEnumerable<ID2D1SvgElement> DescendantsAndSelf() | ||
| { | ||
| yield return this; | ||
| foreach (ID2D1SvgElement child in this) | ||
| { | ||
| foreach (ID2D1SvgElement descendant in child.DescendantsAndSelf()) | ||
| { | ||
| yield return descendant; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public IEnumerable<ID2D1SvgElement> Descendants() | ||
| { | ||
| foreach (ID2D1SvgElement child in this) | ||
| { | ||
| yield return child; | ||
| foreach (ID2D1SvgElement grandchild in child.Descendants()) | ||
| { | ||
| yield return grandchild; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, float value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Float, &value, sizeof(float)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, Color4 value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Color, (float*)&value, sizeof(Color4)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, FillMode value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.FillMode, &value, sizeof(FillMode)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgDisplay value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Display, &value, sizeof(SvgDisplay)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgOverflow value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Overflow, &value, sizeof(SvgOverflow)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgLineJoin value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.LineJoin, &value, sizeof(SvgLineJoin)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgLineCap value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.LineCap, &value, sizeof(SvgLineCap)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgVisibility value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Visibility, &value, sizeof(SvgVisibility)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, Matrix3x2 value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Matrix, (float*)&value, sizeof(Matrix3x2)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgUnitType value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.UnitType, &value, sizeof(SvgUnitType)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, ExtendMode value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.ExtendMode, &value, sizeof(ExtendMode)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgPreserveAspectRatio value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.PreserveAspectRatio, &value, sizeof(SvgPreserveAspectRatio)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgViewbox value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Viewbox, &value, sizeof(SvgViewbox)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue(string name, SvgLength value) | ||
| { | ||
| return SetAttributeValue(name, SvgAttributePodType.Length, &value, sizeof(SvgLength)); | ||
| } | ||
|
|
||
| public Result SetAttributeValue<T>(string name, SvgAttributePodType type, in T value) where T : unmanaged | ||
| { | ||
| fixed (T* pValue = &value) | ||
| { | ||
| return SetAttributeValue(name, type, (IntPtr)pValue, sizeof(T)); | ||
| } | ||
| } | ||
|
|
||
| private Result SetAttributeValue(string name, SvgAttributePodType type, void* value, int valueSizeInBytes) | ||
| { | ||
| return SetAttributeValue(name, type, (IntPtr)value, valueSizeInBytes); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright © Amer Koleci and Contributors. | ||
| // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. | ||
|
|
||
| using System.Drawing; | ||
|
|
||
| namespace Vortice.Direct2D1; | ||
|
|
||
| public partial struct SvgLength | ||
| { | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="SvgLength"/> struct. | ||
| /// </summary> | ||
| public SvgLength(float value, SvgLengthUnits units) | ||
| { | ||
| Value = value; | ||
| Units = units; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // Copyright © Amer Koleci and Contributors. | ||
| // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. | ||
|
|
||
| using System.Drawing; | ||
|
|
||
| namespace Vortice.Direct2D1; | ||
|
|
||
| public partial struct SvgPreserveAspectRatio | ||
| { | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="SvgLength"/> struct. | ||
| /// </summary> | ||
| public SvgPreserveAspectRatio(bool defer, SvgAspectAlign align, SvgAspectScaling meetOrSlice) | ||
| { | ||
| Defer = defer; | ||
| Align = align; | ||
| MeetOrSlice = meetOrSlice; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Copyright © Amer Koleci and Contributors. | ||
| // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. | ||
|
|
||
| using System.Drawing; | ||
|
|
||
| namespace Vortice.Direct2D1; | ||
|
|
||
| public partial struct SvgViewbox | ||
| { | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="SvgViewbox"/> struct. | ||
| /// </summary> | ||
| public SvgViewbox(float x, float y, float width, float height) | ||
| { | ||
| X = x; | ||
| Y = y; | ||
| Width = width; | ||
| Height = height; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.