diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-23 05:12:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-23 05:12:23 +0400 |
| commit | 68b0a8e39026ea2b391751406dc4bdb0a4ed958c (patch) | |
| tree | cdf8a143a6cf2b832f49a31c2d3b7003f92eaa43 /release/scripts/freestyle | |
| parent | 0fb83d78faa99a8ea3fd396887b2b31a6a36a8cd (diff) | |
Freestyle Python API improvements - part 7.
Fix for PyGetSetDef and proper handling of keyword arguments were done in
UnaryPredicate0D, UnaryPredicate1D, BinaryPredicate1D, and StrokeShader classes.
Style modules were updated accordingly. Additional code clean-up was also made.
Diffstat (limited to 'release/scripts/freestyle')
7 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/freestyle/style_modules/anisotropic_diffusion.py b/release/scripts/freestyle/style_modules/anisotropic_diffusion.py index 83cc9991d8b..44a820a1048 100644 --- a/release/scripts/freestyle/style_modules/anisotropic_diffusion.py +++ b/release/scripts/freestyle/style_modules/anisotropic_diffusion.py @@ -39,7 +39,7 @@ bpred = TrueBP1D() Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred) ) shaders_list = [ ConstantThicknessShader(4), - StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0), + StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False), SamplingShader(2), pyDiffusion2Shader(offset, nbIter), IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1) diff --git a/release/scripts/freestyle/style_modules/curvature2d.py b/release/scripts/freestyle/style_modules/curvature2d.py index 0c013997a16..ca84bf21b83 100644 --- a/release/scripts/freestyle/style_modules/curvature2d.py +++ b/release/scripts/freestyle/style_modules/curvature2d.py @@ -33,7 +33,7 @@ from shaders import * Operators.select(QuantitativeInvisibilityUP1D(0)) Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0))) shaders_list = [ - StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0), + StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False), ConstantThicknessShader(5), py2DCurvatureColorShader() ] diff --git a/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py b/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py index 163c891fa90..76ab4343316 100644 --- a/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py +++ b/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py @@ -38,7 +38,7 @@ Operators.select(QuantitativeInvisibilityUP1D(0)) Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,0)) shaders_list = [ SamplingShader(2), - SpatialNoiseShader(15, 120, 2, 1, 1), + SpatialNoiseShader(15, 120, 2, True, True), IncreasingThicknessShader(5, 30), SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1), IncreasingColorShader(0,0.2,0,1,0.2,0.7,0.2,1), diff --git a/release/scripts/freestyle/style_modules/sketchy_topology_broken.py b/release/scripts/freestyle/style_modules/sketchy_topology_broken.py index e51acb93fbc..eb600e62af7 100644 --- a/release/scripts/freestyle/style_modules/sketchy_topology_broken.py +++ b/release/scripts/freestyle/style_modules/sketchy_topology_broken.py @@ -38,7 +38,7 @@ Operators.select(QuantitativeInvisibilityUP1D(0)) Operators.bidirectionalChain(pySketchyChainingIterator(3)) shaders_list = [ SamplingShader(4), - SpatialNoiseShader(6, 120, 2, 1, 1), + SpatialNoiseShader(6, 120, 2, True, True), IncreasingThicknessShader(4, 10), SmoothingShader(100, 0.1, 0, 0.2, 0, 0, 0, 1), pyBackboneStretcherNoCuspShader(20), diff --git a/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py b/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py index 85e11af38b9..0c2d9d759a6 100644 --- a/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py +++ b/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py @@ -38,7 +38,7 @@ Operators.select(upred) Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,1)) shaders_list = [ SamplingShader(4), - SpatialNoiseShader(20, 220, 2, 1, 1), + SpatialNoiseShader(20, 220, 2, True, True), IncreasingThicknessShader(4, 8), SmoothingShader(300, 0.05, 0, 0.2, 0, 0, 0, 0.5), ConstantColorShader(0.6,0.2,0.0), diff --git a/release/scripts/freestyle/style_modules/stroke_texture.py b/release/scripts/freestyle/style_modules/stroke_texture.py index afebbe30a90..035967dc39c 100644 --- a/release/scripts/freestyle/style_modules/stroke_texture.py +++ b/release/scripts/freestyle/style_modules/stroke_texture.py @@ -36,7 +36,7 @@ Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvi shaders_list = [ SamplingShader(3), BezierCurveShader(4), - StrokeTextureShader("washbrushAlpha.bmp", Stroke.DRY_MEDIUM, 1), + StrokeTextureShader("washbrushAlpha.bmp", Stroke.DRY_MEDIUM, True), ConstantThicknessShader(40), ConstantColorShader(0,0,0,1), ] diff --git a/release/scripts/freestyle/style_modules/uniformpruning_zsort.py b/release/scripts/freestyle/style_modules/uniformpruning_zsort.py index 9a8ba0d12f8..c8537cd4241 100644 --- a/release/scripts/freestyle/style_modules/uniformpruning_zsort.py +++ b/release/scripts/freestyle/style_modules/uniformpruning_zsort.py @@ -12,7 +12,7 @@ Operators.bidirectionalChain(ChainSilhouetteIterator()) #Operators.sequentialSplit(pyVertexNatureUP0D(Nature.VIEW_VERTEX), 2) Operators.sort(pyZBP1D()) shaders_list = [ - StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0), + StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False), ConstantThicknessShader(3), SamplingShader(5.0), ConstantColorShader(0,0,0,1) |