-
Notifications
You must be signed in to change notification settings - Fork 806
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CGPathApply * Curve Apply Test Page * Update tests, address CR feedback, move geometry sink to individual file. * Addressing CR Feedback. * Fix no-op on cgpathapply when path is null. * Address CR Feedback * Single element point arrays are now just a variable * Ignoring clang warnings on ARM builds for WRL helpers. * Replace lost ID from last commit.
- Loading branch information
Showing
27 changed files
with
497 additions
and
142 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
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,91 @@ | ||
| //****************************************************************************** | ||
| // | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // | ||
| // This code is licensed under the MIT License (MIT). | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
| // | ||
| //****************************************************************************** | ||
|
|
||
| #import <CoreGraphics/D2DWrapper.h> | ||
|
|
||
| #import "CGPathInternal.h" | ||
|
|
||
| #include <COMIncludes.h> | ||
| #import <WRLHelpers.h> | ||
| #include <COMIncludes_End.h> | ||
|
|
||
| using namespace Microsoft::WRL; | ||
|
|
||
| // The CGPathApplySink is an implementation of the ID2D1SimplifiedGeometrySink. We use this sink to create a custom callback for each | ||
| // figure type of the path. This will let us call the CGPathApplierFunction provided to us automatically through the use of D2D APIs. | ||
| // This should only be used with CGPathApply as it is very specialized for this case only. | ||
| class _CGPathApplySink : public RuntimeClass<RuntimeClassFlags<RuntimeClassType::WinRtClassicComMix>, ID2D1SimplifiedGeometrySink> { | ||
| protected: | ||
| InspectableClass(L"Windows.Bridge.Direct2D._CGPathApplySink", TrustLevel::BaseTrust); | ||
|
|
||
| public: | ||
| _CGPathApplySink(_In_ void* info, _In_ CGPathApplierFunction function) : m_info(info), m_pathApplierFunction(function) { | ||
| } | ||
|
|
||
| STDMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT* beziers, UINT bezierCount) { | ||
| FAIL_FAST_IF_NULL(beziers); | ||
| for (UINT i = 0; i < bezierCount; ++i) { | ||
| CGPoint pathPoints[3] = { _D2DPointToCGPoint(beziers[i].point1), | ||
| _D2DPointToCGPoint(beziers[i].point2), | ||
| _D2DPointToCGPoint(beziers[i].point3) }; | ||
| CGPathElement element = { kCGPathElementAddCurveToPoint, pathPoints }; | ||
| m_pathApplierFunction(m_info, &element); | ||
| } | ||
| } | ||
|
|
||
| STDMETHOD_(void, AddLines)(const D2D1_POINT_2F* points, UINT pointsCount) { | ||
| FAIL_FAST_IF_NULL(points); | ||
| for (UINT i = 0; i < pointsCount; ++i) { | ||
| CGPoint pathPoint = _D2DPointToCGPoint(points[i]); | ||
|
|
||
| CGPathElement element = { kCGPathElementAddLineToPoint, &pathPoint }; | ||
| m_pathApplierFunction(m_info, &element); | ||
| } | ||
| } | ||
|
|
||
| STDMETHOD_(void, BeginFigure)(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) { | ||
| CGPoint pathPoint = _D2DPointToCGPoint(startPoint); | ||
|
|
||
| CGPathElement element = { kCGPathElementMoveToPoint, &pathPoint }; | ||
| m_pathApplierFunction(m_info, &element); | ||
| } | ||
|
|
||
| // End Figure is empty as there is no expected callback for a figure ending, there is a callback strictly for a sub path being closed. | ||
| STDMETHOD_(void, EndFigure)(D2D1_FIGURE_END figureEnd) { | ||
| } | ||
|
|
||
| // This custom class is striclty for callbacks on figures. | ||
| STDMETHOD_(void, SetFillMode)(D2D1_FILL_MODE fillMode) { | ||
| } | ||
|
|
||
| // This custom class is striclty for callbacks on figures. | ||
| STDMETHOD_(void, SetSegmentFlags)(D2D1_PATH_SEGMENT vertexFlags) { | ||
| } | ||
|
|
||
| STDMETHOD(Close)() { | ||
| return S_OK; | ||
| } | ||
|
|
||
| private: | ||
| void* m_info; | ||
| CGPathApplierFunction m_pathApplierFunction; | ||
| }; | ||
|
|
||
| HRESULT _CGPathApplyInternal(ID2D1PathGeometry* pathGeometry, void* info, CGPathApplierFunction function) { | ||
| ComPtr<_CGPathApplySink> sink = Make<_CGPathApplySink>(info, function); | ||
| RETURN_IF_FAILED(pathGeometry->Simplify(D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, D2D1::IdentityMatrix(), sink.Get())); | ||
| return S_OK; | ||
| } |
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.