diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-11-25 02:18:38 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-01-28 18:33:58 +0400 |
commit | 54e90167704072f0105eb279e7431caa6c4d8e20 (patch) | |
tree | ce17a581373aa05cd040b3423b4c112d47ba7e57 /release/scripts/freestyle/styles/external_contour_sketchy.py | |
parent | 6498b96ce7081db039354228213d72e8c70bd3aa (diff) |
Updated Freestyle API modules according to the new hierarchical package structure.
Additional bug fixes were also done along with the code updates:
* Fix for the use of old Interface1D.pointsBegin() and .pointsEnd() method names
in the definition of pyDensityAnisotropyF1D and pyViewMapGradientNormF1D.
* Fix for wrong data types (int instead of bool) for:
- pyChainSilhouetteGenericIterator constructor and its .orientation property in
modules/freestyle/chainingiterators.py.
- SpatialNoiseShader constructor in styles/external_contour_sketchy.py.
- ChainSilhouetteIterator constructor in styles/multiple_parameterization.py.
Diffstat (limited to 'release/scripts/freestyle/styles/external_contour_sketchy.py')
-rw-r--r-- | release/scripts/freestyle/styles/external_contour_sketchy.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/release/scripts/freestyle/styles/external_contour_sketchy.py b/release/scripts/freestyle/styles/external_contour_sketchy.py index b8d381ea24e..2163ce4d52c 100644 --- a/release/scripts/freestyle/styles/external_contour_sketchy.py +++ b/release/scripts/freestyle/styles/external_contour_sketchy.py @@ -23,18 +23,30 @@ # chaining iterator (in particular each ViewEdge can be drawn # several times -from ChainingIterators import pySketchyChainingIterator -from freestyle import ExternalContourUP1D, IncreasingColorShader, IncreasingThicknessShader, \ - Operators, QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ - TextureAssignerShader, TrueUP1D -from logical_operators import AndUP1D, NotUP1D +from freestyle import Operators +from freestyle.chainingiterators import pySketchyChainingIterator +from freestyle.predicates import ( + AndUP1D, + ExternalContourUP1D, + NotUP1D, + QuantitativeInvisibilityUP1D, + TrueUP1D, + ) +from freestyle.shaders import ( + IncreasingColorShader, + IncreasingThicknessShader, + SamplingShader, + SmoothingShader, + SpatialNoiseShader, + TextureAssignerShader, + ) upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D()) Operators.select(upred) Operators.bidirectional_chain(pySketchyChainingIterator(), NotUP1D(upred)) shaders_list = [ SamplingShader(4), - SpatialNoiseShader(10, 150, 2, 1, 1), + SpatialNoiseShader(10, 150, 2, True, True), IncreasingThicknessShader(4, 10), SmoothingShader(400, 0.1, 0, 0.2, 0, 0, 0, 1), IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1), |