Added new line style options for sketchy chaining of feature edges.

The default chaining option is now called "Natural", while the new chaining options
are "Sketchy: Topology Preserved" and "Sketchy: Topology broken".  The latter two
options allow for generating chains of feature edges with a sketchy multiple touch.
The "Sketchy: Topology Preserved" option takes account of the topology of objects
in the view map, while the "Sketchy: Topology broken" ignores the edge topology.
The "rounds" option specifies the number of rounds in sketchy strokes.

1 files changed, 9 insertions, 4 deletions

diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index 45c242fec8e..0324586b135 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -881,10 +881,15 @@ def process(layer_name, lineset_name):
         upred = TrueUP1D()
     Operators.select(upred)
     # join feature edges to form chains
-    bpred = AngleLargerThanBP1D(1.0) # XXX temporary fix for occasional unexpected long lines
-    if linestyle.same_object:
-        bpred = AndBP1D(bpred, SameShapeIdBP1D())
-    Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+    if linestyle.chaining == "NATURAL":
+        bpred = AngleLargerThanBP1D(1.0) # XXX temporary fix for occasional unexpected long lines
+        if linestyle.same_object:
+            bpred = AndBP1D(bpred, SameShapeIdBP1D())
+        Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+    elif linestyle.chaining == "SKETCHY_TOPOLOGY_PRESERVED":
+        Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(linestyle.rounds))
+    elif linestyle.chaining == "SKETCHY_TOPOLOGY_BROKEN":
+        Operators.bidirectionalChain(pySketchyChainingIterator(linestyle.rounds))
     # split chains
     if linestyle.material_boundary:
         Operators.sequentialSplit(MaterialBoundaryUP0D())