diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-28 16:20:21 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-28 16:20:21 +0000 |
| commit | a5764233aa6b207c4169fff7fccae567a160a0fd (patch) | |
| tree | 61f3d9581e178cf6c589711ef5c3b9b140448eaf /gyp | |
| parent | d3b9fbbc48c13a1b2a664cf7e01374a44c201f51 (diff) | |
first support at shape ops support for quads
git-svn-id: http://skia.googlecode.com/svn/trunk@3520 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/shapeops_demo.gyp | 52 | ||||
| -rw-r--r-- | gyp/shapeops_edge.gyp | 22 |
2 files changed, 63 insertions, 11 deletions
diff --git a/gyp/shapeops_demo.gyp b/gyp/shapeops_demo.gyp index f004850846..f3a8b4207b 100644 --- a/gyp/shapeops_demo.gyp +++ b/gyp/shapeops_demo.gyp @@ -12,13 +12,43 @@ '../experimental/SimpleCocoaApp', # needed to get SimpleApp.h ], 'sources': [ + '../experimental/Intersection/ConvexHull.cpp', + '../experimental/Intersection/CubeRoot.cpp', + '../experimental/Intersection/CubicBezierClip.cpp', + '../experimental/Intersection/CubicIntersection.cpp', + '../experimental/Intersection/CubicReduceOrder.cpp', + '../experimental/Intersection/CubicSubDivide.cpp', + '../experimental/Intersection/CubicUtilities.cpp', '../experimental/Intersection/DataTypes.cpp', + '../experimental/Intersection/EdgeDemo.cpp', + '../experimental/Intersection/EdgeDemoApp.mm', '../experimental/Intersection/EdgeWalker.cpp', '../experimental/Intersection/EdgeWalker_TestUtility.cpp', + '../experimental/Intersection/Extrema.cpp', + '../experimental/Intersection/LineCubicIntersection.cpp '../experimental/Intersection/LineIntersection.cpp', '../experimental/Intersection/LineParameterization.cpp', + '../experimental/Intersection/LineQuadraticIntersection.cpp', '../experimental/Intersection/LineUtilities.cpp', - '../experimental/Intersection/EdgeDemoApp.mm', + '../experimental/Intersection/QuadraticBezierClip.cpp', + '../experimental/Intersection/QuadraticIntersection.cpp', + '../experimental/Intersection/QuadraticReduceOrder.cpp', + '../experimental/Intersection/QuadraticSubDivide.cpp', + '../experimental/Intersection/QuadraticUtilities.cpp', + '../experimental/Intersection/CubicIntersection.h', + '../experimental/Intersection/CubicUtilities.h', + '../experimental/Intersection/CurveIntersection.h', + '../experimental/Intersection/DataTypes.h', + '../experimental/Intersection/EdgeDemo.h', + '../experimental/Intersection/Extrema.h', + '../experimental/Intersection/Intersections.h', + '../experimental/Intersection/IntersectionUtilities.h', + '../experimental/Intersection/LineIntersection.h', + '../experimental/Intersection/LineParameters.h', + '../experimental/Intersection/LineUtilities.h', + '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/TSearch.h', ], 'dependencies': [ 'core.gyp:core', @@ -44,16 +74,16 @@ 'sources': [ # Mac files - '../src/utils/mac/SkEventNotifier.h', - '../src/utils/mac/SkEventNotifier.mm', - '../src/utils/mac/skia_mac.mm', - '../src/utils/mac/SkNSView.h', - '../src/utils/mac/SkNSView.mm', - '../src/utils/mac/SkOptionsTableView.h', - '../src/utils/mac/SkOptionsTableView.mm', - '../src/utils/mac/SkOSWindow_Mac.mm', - '../src/utils/mac/SkTextFieldCell.h', - '../src/utils/mac/SkTextFieldCell.m', + '../src/views/mac/SkEventNotifier.h', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', ], 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', diff --git a/gyp/shapeops_edge.gyp b/gyp/shapeops_edge.gyp index 58f5052a85..b5c9d16a3d 100644 --- a/gyp/shapeops_edge.gyp +++ b/gyp/shapeops_edge.gyp @@ -38,6 +38,7 @@ '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.cpp', '../experimental/Intersection/EdgeWalkerPolygons_Test.cpp', '../experimental/Intersection/EdgeWalkerQuadralaterals_Test.cpp', + '../experimental/Intersection/EdgeWalkerQuadratics_Test.cpp', '../experimental/Intersection/EdgeWalkerRectangles_Test.cpp', '../experimental/Intersection/Extrema.cpp', '../experimental/Intersection/Inline_Tests.cpp', @@ -65,6 +66,27 @@ '../experimental/Intersection/QuadraticUtilities.cpp', '../experimental/Intersection/RectUtilities.cpp', '../experimental/Intersection/TestUtilities.cpp', + '../experimental/Intersection/CubicIntersection.h', + '../experimental/Intersection/CubicIntersection_TestData.h', + '../experimental/Intersection/CubicUtilities.h', + '../experimental/Intersection/CurveIntersection.h', + '../experimental/Intersection/DataTypes.h', + '../experimental/Intersection/EdgeMain.h', + '../experimental/Intersection/EdgeWalker_Test.h', + '../experimental/Intersection/EdgeWalkerPolygons_Mismatches.h', + '../experimental/Intersection/Extrema.h', + '../experimental/Intersection/Intersection_Tests.h', + '../experimental/Intersection/Intersections.h', + '../experimental/Intersection/IntersectionUtilities.h', + '../experimental/Intersection/LineIntersection.h', + '../experimental/Intersection/LineParameters.h', + '../experimental/Intersection/LineUtilities.h', + '../experimental/Intersection/Parameterization_Test.h', + '../experimental/Intersection/QuadraticIntersection_TestData.h', + '../experimental/Intersection/QuadraticUtilities.h', + '../experimental/Intersection/ShapeOps.h', + '../experimental/Intersection/TestUtilities.h', + '../experimental/Intersection/TSearch.h', ], 'dependencies': [ 'core.gyp:core', |