Implement conics for NVPR

include/core/SkPath.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPath_DEFINED
@@ skipping 262 matching lines @@
 
     /** Returns the number of verbs in the path. Up to max verbs are copied. The
         verbs are copied as one byte per verb.
 
         @param verbs If not null, receives up to max verbs
         @param max The maximum number of verbs to copy into verbs
         @return the actual number of verbs in the path
     */
     int getVerbs(uint8_t verbs[], int max) const;
 
+    /** Return the number of conic weights in the path
+     */
+    int countConicWeights() const;

[reed1, 2014/11/12 14:06:39]

ick ich, do we really need to make these two apis public?

[Kimmo Kinnunen, 2014/11/19 16:25:39]

Done.

+
+    /** Return the weight of index'th conic. If the index is out of range
+        (i.e. is not 0 <= index < countConicWeights()) then the returned weight
+        will be zero.
+     */
+    SkScalar getConicWeight(int index) const;
+
+
     //! Swap contents of this and other. Guaranteed not to throw
     void swap(SkPath& other);
 
     /** Returns the bounds of the path's points. If the path contains 0 or 1
         points, the bounds is set to (0,0,0,0), and isEmpty() will return true.
         Note: this bounds may be larger than the actual shape, since curves
         do not extend as far as their control points.
     */
     const SkRect& getBounds() const {
         return fPathRef->getBounds();
@@ skipping 537 matching lines @@
      *  Returns a mask, where each bit corresponding to a SegmentMask is
      *  set if the path contains 1 or more segments of that type.
      *  Returns 0 for an empty path (no segments).
      */
     uint32_t getSegmentMasks() const { return fPathRef->getSegmentMasks(); }
 
     enum Verb {
         kMove_Verb,     //!< iter.next returns 1 point
         kLine_Verb,     //!< iter.next returns 2 points
         kQuad_Verb,     //!< iter.next returns 3 points
-        kConic_Verb,    //!< iter.next returns 3 points + iter.conicWeight()
+        kConic_Verb,    //!< iter.next returns 2 points + iter.conicWeight()
         kCubic_Verb,    //!< iter.next returns 4 points
         kClose_Verb,    //!< iter.next returns 1 point (contour's moveTo pt)
         kDone_Verb,     //!< iter.next returns 0 points
     };
 
     /** Iterate through all of the segments (lines, quadratics, cubics) of
         each contours in a path.
 
         The iterator cleans up the segments along the way, removing degenerate
         segments and adding close verbs where necessary. When the forceClose
@@ skipping 209 matching lines @@
     }
 
     friend class SkAutoPathBoundsUpdate;
     friend class SkAutoDisableOvalCheck;
     friend class SkAutoDisableDirectionCheck;
     friend class SkBench_AddPathTest; // perf test reversePathTo
     friend class PathTest_Private; // unit test reversePathTo
 };
 
 #endif