diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-07 15:22:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-07 15:22:54 +0400 |
commit | eb495b2a8a331e74bdcedd9c0d5415b4c20a136d (patch) | |
tree | 5c60a0dfc2bef7fbb3f16118ac3e9817b2c36b22 /release | |
parent | 7b7ba9ba07f35f5b79f2968ea7ad6ec5e3db9016 (diff) |
use lowercase name for freestyle module (as with all other blender modules).
Diffstat (limited to 'release')
48 files changed, 58 insertions, 58 deletions
diff --git a/release/scripts/freestyle/style_modules/ChainingIterators.py b/release/scripts/freestyle/style_modules/ChainingIterators.py index f0dfc468adb..03ad837aa28 100644 --- a/release/scripts/freestyle/style_modules/ChainingIterators.py +++ b/release/scripts/freestyle/style_modules/ChainingIterators.py @@ -21,8 +21,8 @@ # Date : 04/08/2005 # Purpose : Chaining Iterators to be used with chaining operators -from Freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex -from Freestyle import ContextFunctions as CF +from freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex +from freestyle import ContextFunctions as CF ## the natural chaining iterator ## It follows the edges of same nature following the topology of diff --git a/release/scripts/freestyle/style_modules/Functions0D.py b/release/scripts/freestyle/style_modules/Functions0D.py index b36961f3f91..eac168a3b6d 100644 --- a/release/scripts/freestyle/style_modules/Functions0D.py +++ b/release/scripts/freestyle/style_modules/Functions0D.py @@ -21,10 +21,10 @@ # Date : 30/06/2005 # Purpose : Functions (functors) to be used for 0D elements -from Freestyle import Curvature2DAngleF0D, CurvePoint, ReadCompleteViewMapPixelF0D, \ +from freestyle import Curvature2DAngleF0D, CurvePoint, ReadCompleteViewMapPixelF0D, \ ReadSteerableViewMapPixelF0D, UnaryFunction0DDouble, UnaryFunction0DMaterial, \ UnaryFunction0DVec2f -from Freestyle import ContextFunctions as CF +from freestyle import ContextFunctions as CF import math import mathutils diff --git a/release/scripts/freestyle/style_modules/Functions1D.py b/release/scripts/freestyle/style_modules/Functions1D.py index 17b4f1922a6..3e74b1817eb 100644 --- a/release/scripts/freestyle/style_modules/Functions1D.py +++ b/release/scripts/freestyle/style_modules/Functions1D.py @@ -21,7 +21,7 @@ # Date : 08/04/2005 # Purpose : Functions (functors) to be used for 1D elements -from Freestyle import GetProjectedZF1D, IntegrationType, UnaryFunction1DDouble, integrate +from freestyle import GetProjectedZF1D, IntegrationType, UnaryFunction1DDouble, integrate from Functions0D import pyDensityAnisotropyF0D, pyViewMapGradientNormF0D import string diff --git a/release/scripts/freestyle/style_modules/PredicatesB1D.py b/release/scripts/freestyle/style_modules/PredicatesB1D.py index 642ff5f9845..21bba923a2a 100644 --- a/release/scripts/freestyle/style_modules/PredicatesB1D.py +++ b/release/scripts/freestyle/style_modules/PredicatesB1D.py @@ -21,7 +21,7 @@ # Date : 08/04/2005 # Purpose : Binary predicates (functors) to be used for 1D elements -from Freestyle import BinaryPredicate1D, GetZF1D, IntegrationType, Nature, SameShapeIdBP1D, ZDiscontinuityF1D +from freestyle import BinaryPredicate1D, GetZF1D, IntegrationType, Nature, SameShapeIdBP1D, ZDiscontinuityF1D from Functions1D import pyViewMapGradientNormF1D import random diff --git a/release/scripts/freestyle/style_modules/PredicatesU0D.py b/release/scripts/freestyle/style_modules/PredicatesU0D.py index 49675eb3c6a..7119740ce49 100644 --- a/release/scripts/freestyle/style_modules/PredicatesU0D.py +++ b/release/scripts/freestyle/style_modules/PredicatesU0D.py @@ -21,7 +21,7 @@ # Date : 08/04/2005 # Purpose : Unary predicates (functors) to be used for 0D elements -from Freestyle import Curvature2DAngleF0D, Nature, QuantitativeInvisibilityF0D, UnaryPredicate0D +from freestyle import Curvature2DAngleF0D, Nature, QuantitativeInvisibilityF0D, UnaryPredicate0D from Functions0D import pyCurvilinearLengthF0D class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D): diff --git a/release/scripts/freestyle/style_modules/PredicatesU1D.py b/release/scripts/freestyle/style_modules/PredicatesU1D.py index 5c48219e9f4..30472dc34b0 100644 --- a/release/scripts/freestyle/style_modules/PredicatesU1D.py +++ b/release/scripts/freestyle/style_modules/PredicatesU1D.py @@ -21,7 +21,7 @@ # Date : 08/04/2005 # Purpose : Unary predicates (functors) to be used for 1D elements -from Freestyle import Curvature2DAngleF0D, CurveNatureF1D, DensityF1D, GetCompleteViewMapDensityF1D, \ +from freestyle import Curvature2DAngleF0D, CurveNatureF1D, DensityF1D, GetCompleteViewMapDensityF1D, \ GetDirectionalViewMapDensityF1D, GetOccludersF1D, GetProjectedZF1D, GetShapeF1D, GetSteerableViewMapDensityF1D, \ IntegrationType, ShapeUP1D, TVertex, UnaryPredicate1D from Functions1D import pyDensityAnisotropyF1D, pyViewMapGradientNormF1D diff --git a/release/scripts/freestyle/style_modules/anisotropic_diffusion.py b/release/scripts/freestyle/style_modules/anisotropic_diffusion.py index bc1654475ac..274381a9a89 100644 --- a/release/scripts/freestyle/style_modules/anisotropic_diffusion.py +++ b/release/scripts/freestyle/style_modules/anisotropic_diffusion.py @@ -21,7 +21,7 @@ # Date : 12/08/2004 # Purpose : Smoothes lines using an anisotropic diffusion scheme -from Freestyle import ChainPredicateIterator, ConstantThicknessShader, ExternalContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ConstantThicknessShader, ExternalContourUP1D, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, Stroke, StrokeTextureShader, TrueBP1D, TrueUP1D from logical_operators import AndUP1D, NotUP1D from shaders import pyDiffusion2Shader diff --git a/release/scripts/freestyle/style_modules/apriori_and_causal_density.py b/release/scripts/freestyle/style_modules/apriori_and_causal_density.py index 8284f7308f8..501c5169be9 100644 --- a/release/scripts/freestyle/style_modules/apriori_and_causal_density.py +++ b/release/scripts/freestyle/style_modules/apriori_and_causal_density.py @@ -23,7 +23,7 @@ # subjects them to the causal density so as to avoid # cluttering -from Freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ +from freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ Operators, QuantitativeInvisibilityUP1D, TrueBP1D from PredicatesU1D import pyDensityUP1D, pyHighViewMapDensityUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/apriori_density.py b/release/scripts/freestyle/style_modules/apriori_density.py index 575f2b92a25..f59dd5cd36d 100644 --- a/release/scripts/freestyle/style_modules/apriori_density.py +++ b/release/scripts/freestyle/style_modules/apriori_density.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws lines having a high a priori density -from Freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, Operators, \ +from freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, TrueBP1D, TrueUP1D from PredicatesU1D import pyHighViewMapDensityUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/backbone_stretcher.py b/release/scripts/freestyle/style_modules/backbone_stretcher.py index 1e113bec368..c920d66328e 100644 --- a/release/scripts/freestyle/style_modules/backbone_stretcher.py +++ b/release/scripts/freestyle/style_modules/backbone_stretcher.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Stretches the geometry of visible lines -from Freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ConstantColorShader, \ +from freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ConstantColorShader, \ Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/blueprint_circles.py b/release/scripts/freestyle/style_modules/blueprint_circles.py index 769615e791f..8d80893a6c3 100644 --- a/release/scripts/freestyle/style_modules/blueprint_circles.py +++ b/release/scripts/freestyle/style_modules/blueprint_circles.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Produces a blueprint using circular contour strokes -from Freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D from PredicatesU1D import pyHigherLengthUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/blueprint_ellipses.py b/release/scripts/freestyle/style_modules/blueprint_ellipses.py index 70c999fa2c7..d5e9f385c12 100644 --- a/release/scripts/freestyle/style_modules/blueprint_ellipses.py +++ b/release/scripts/freestyle/style_modules/blueprint_ellipses.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Produces a blueprint using elliptic contour strokes -from Freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D from PredicatesU1D import pyHigherLengthUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/blueprint_squares.py b/release/scripts/freestyle/style_modules/blueprint_squares.py index 7193beb8de5..35cfc33fd69 100644 --- a/release/scripts/freestyle/style_modules/blueprint_squares.py +++ b/release/scripts/freestyle/style_modules/blueprint_squares.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Produces a blueprint using square contour strokes -from Freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D from PredicatesU1D import pyHigherLengthUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/cartoon.py b/release/scripts/freestyle/style_modules/cartoon.py index 61bc11520a1..de4a5dd6c5d 100644 --- a/release/scripts/freestyle/style_modules/cartoon.py +++ b/release/scripts/freestyle/style_modules/cartoon.py @@ -23,7 +23,7 @@ # infered from each object's material in a cartoon-like # fashion. -from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ +from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, TrueUP1D from logical_operators import NotUP1D from shaders import pyMaterialColorShader diff --git a/release/scripts/freestyle/style_modules/contour.py b/release/scripts/freestyle/style_modules/contour.py index e4eb8c2c3ae..f7a42d9c906 100644 --- a/release/scripts/freestyle/style_modules/contour.py +++ b/release/scripts/freestyle/style_modules/contour.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws each object's visible contour -from Freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ConstantThicknessShader, ContourUP1D, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TrueUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/curvature2d.py b/release/scripts/freestyle/style_modules/curvature2d.py index 57bc8382220..4204951fbd5 100644 --- a/release/scripts/freestyle/style_modules/curvature2d.py +++ b/release/scripts/freestyle/style_modules/curvature2d.py @@ -22,7 +22,7 @@ # Purpose : The stroke points are colored in gray levels and depending # on the 2d curvature value -from Freestyle import ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ +from freestyle import ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, Stroke, StrokeTextureShader, TrueUP1D from logical_operators import NotUP1D from shaders import py2DCurvatureColorShader diff --git a/release/scripts/freestyle/style_modules/external_contour.py b/release/scripts/freestyle/style_modules/external_contour.py index 28bd28f2a7a..c7e51f1a16d 100644 --- a/release/scripts/freestyle/style_modules/external_contour.py +++ b/release/scripts/freestyle/style_modules/external_contour.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws the external contour of the scene -from Freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, \ ExternalContourUP1D, Operators, QuantitativeInvisibilityUP1D, TrueBP1D, TrueUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/external_contour_sketchy.py b/release/scripts/freestyle/style_modules/external_contour_sketchy.py index d85e9674e90..b8d381ea24e 100644 --- a/release/scripts/freestyle/style_modules/external_contour_sketchy.py +++ b/release/scripts/freestyle/style_modules/external_contour_sketchy.py @@ -24,7 +24,7 @@ # several times from ChainingIterators import pySketchyChainingIterator -from Freestyle import ExternalContourUP1D, IncreasingColorShader, IncreasingThicknessShader, \ +from freestyle import ExternalContourUP1D, IncreasingColorShader, IncreasingThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ TextureAssignerShader, TrueUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/external_contour_smooth.py b/release/scripts/freestyle/style_modules/external_contour_smooth.py index f42f3bf3338..045984ea4a5 100644 --- a/release/scripts/freestyle/style_modules/external_contour_smooth.py +++ b/release/scripts/freestyle/style_modules/external_contour_smooth.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws a smooth external contour -from Freestyle import ChainPredicateIterator, ExternalContourUP1D, IncreasingColorShader, \ +from freestyle import ChainPredicateIterator, ExternalContourUP1D, IncreasingColorShader, \ IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ SmoothingShader, TrueBP1D, TrueUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/haloing.py b/release/scripts/freestyle/style_modules/haloing.py index ee907ec967f..feadb5dd1ee 100644 --- a/release/scripts/freestyle/style_modules/haloing.py +++ b/release/scripts/freestyle/style_modules/haloing.py @@ -24,7 +24,7 @@ # object and trims them in order to produce # a haloing effect around the target shape -from Freestyle import ChainSilhouetteIterator, Id, IncreasingColorShader, IncreasingThicknessShader, \ +from freestyle import ChainSilhouetteIterator, Id, IncreasingColorShader, IncreasingThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TipRemoverShader, TrueUP1D from PredicatesU1D import pyIsOccludedByUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/ignore_small_occlusions.py b/release/scripts/freestyle/style_modules/ignore_small_occlusions.py index aeab1b2e731..a9dc102a0bd 100644 --- a/release/scripts/freestyle/style_modules/ignore_small_occlusions.py +++ b/release/scripts/freestyle/style_modules/ignore_small_occlusions.py @@ -22,7 +22,7 @@ # Purpose : The strokes are drawn through small occlusions from ChainingIterators import pyFillOcclusionsAbsoluteChainingIterator -from Freestyle import ConstantColorShader, ConstantThicknessShader, Operators, \ +from freestyle import ConstantColorShader, ConstantThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D Operators.select(QuantitativeInvisibilityUP1D(0)) diff --git a/release/scripts/freestyle/style_modules/invisible_lines.py b/release/scripts/freestyle/style_modules/invisible_lines.py index 6a72534d0ac..b94d7b0a5fd 100644 --- a/release/scripts/freestyle/style_modules/invisible_lines.py +++ b/release/scripts/freestyle/style_modules/invisible_lines.py @@ -22,7 +22,7 @@ # Purpose : Draws all lines whose Quantitative Invisibility # is different from 0 -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/japanese_bigbrush.py b/release/scripts/freestyle/style_modules/japanese_bigbrush.py index ca421536c42..4a5203fb31f 100644 --- a/release/scripts/freestyle/style_modules/japanese_bigbrush.py +++ b/release/scripts/freestyle/style_modules/japanese_bigbrush.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Simulates a big brush fr oriental painting -from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ +from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ ConstantThicknessShader, IntegrationType, Operators, QuantitativeInvisibilityUP1D, \ SamplingShader, TextureAssignerShader, TipRemoverShader from Functions0D import pyInverseCurvature2DAngleF0D diff --git a/release/scripts/freestyle/style_modules/logical_operators.py b/release/scripts/freestyle/style_modules/logical_operators.py index cffb9e1cc58..0169ab7f2a7 100644 --- a/release/scripts/freestyle/style_modules/logical_operators.py +++ b/release/scripts/freestyle/style_modules/logical_operators.py @@ -21,7 +21,7 @@ # Date : 08/04/2005 # Purpose : Logical unary predicates (functors) for 1D elements -from Freestyle import UnaryPredicate1D +from freestyle import UnaryPredicate1D class AndUP1D(UnaryPredicate1D): def __init__(self, pred1, pred2): diff --git a/release/scripts/freestyle/style_modules/long_anisotropically_dense.py b/release/scripts/freestyle/style_modules/long_anisotropically_dense.py index 90fc84c5dae..f181bcc2348 100644 --- a/release/scripts/freestyle/style_modules/long_anisotropically_dense.py +++ b/release/scripts/freestyle/style_modules/long_anisotropically_dense.py @@ -28,7 +28,7 @@ # ******** The Directional a priori density maps must ****** # ******** have been computed prior to using this style module ****** -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, DensityF1D, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, DensityF1D, \ IntegrationType, Operators, QuantitativeInvisibilityUP1D, SamplingShader, UnaryPredicate1D from PredicatesB1D import pyLengthBP1D from PredicatesU1D import pyHighDensityAnisotropyUP1D, pyHigherLengthUP1D diff --git a/release/scripts/freestyle/style_modules/multiple_parameterization.py b/release/scripts/freestyle/style_modules/multiple_parameterization.py index 2296a9735ce..922a5ffa972 100644 --- a/release/scripts/freestyle/style_modules/multiple_parameterization.py +++ b/release/scripts/freestyle/style_modules/multiple_parameterization.py @@ -27,7 +27,7 @@ # the strokes using a second parameterization that only # covers the visible portions. -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingColorShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingColorShader, \ IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ TextureAssignerShader, TrueUP1D from shaders import pyHLRShader diff --git a/release/scripts/freestyle/style_modules/nature.py b/release/scripts/freestyle/style_modules/nature.py index dd520c5c85f..fdc627ecade 100644 --- a/release/scripts/freestyle/style_modules/nature.py +++ b/release/scripts/freestyle/style_modules/nature.py @@ -25,7 +25,7 @@ # The suggestive contours must have been enabled in the # options dialog to appear in the View Map. -from Freestyle import ChainSilhouetteIterator, IncreasingColorShader, \ +from freestyle import ChainSilhouetteIterator, IncreasingColorShader, \ IncreasingThicknessShader, Nature, Operators, TrueUP1D from PredicatesU1D import pyNatureUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/near_lines.py b/release/scripts/freestyle/style_modules/near_lines.py index d2dab89d478..977b99546bc 100644 --- a/release/scripts/freestyle/style_modules/near_lines.py +++ b/release/scripts/freestyle/style_modules/near_lines.py @@ -22,7 +22,7 @@ # Purpose : Draws the lines that are "closer" than a threshold # (between 0 and 1) -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ IntegrationType, Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D from PredicatesU1D import pyZSmallerUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/occluded_by_specific_object.py b/release/scripts/freestyle/style_modules/occluded_by_specific_object.py index 4f8c0e859ed..0ae0804f2a8 100644 --- a/release/scripts/freestyle/style_modules/occluded_by_specific_object.py +++ b/release/scripts/freestyle/style_modules/occluded_by_specific_object.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws only the lines that are occluded by a given object -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Id, Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from PredicatesU1D import pyIsInOccludersListUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py index ffb01f06c7b..11398ef2ad8 100644 --- a/release/scripts/freestyle/style_modules/parameter_editor.py +++ b/release/scripts/freestyle/style_modules/parameter_editor.py @@ -21,13 +21,13 @@ # Date : 26/07/2010 # Purpose : Interactive manipulation of stylization parameters -import Freestyle +import freestyle import math import mathutils import time from ChainingIterators import pySketchyChainSilhouetteIterator, pySketchyChainingIterator -from Freestyle import BackboneStretcherShader, BezierCurveShader, BinaryPredicate1D, ChainPredicateIterator, \ +from freestyle import BackboneStretcherShader, BezierCurveShader, BinaryPredicate1D, ChainPredicateIterator, \ ChainSilhouetteIterator, ConstantColorShader, ContourUP1D, Curvature2DAngleF0D, ExternalContourUP1D, \ FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \ PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \ @@ -45,11 +45,11 @@ class ColorRampModifier(StrokeShader): self.__influence = influence self.__ramp = ramp def evaluate(self, t): - col = Freestyle.evaluateColorRamp(self.__ramp, t) + col = freestyle.evaluateColorRamp(self.__ramp, t) col = col.xyz # omit alpha return col def blend_ramp(self, a, b): - return Freestyle.blendRamp(self.__blend, a, self.__influence, b) + return freestyle.blendRamp(self.__blend, a, self.__influence, b) class ScalarBlendModifier(StrokeShader): def __init__(self, blend, influence): @@ -96,13 +96,13 @@ class CurveMappingModifier(ScalarBlendModifier): return 1.0 - t return t def CURVE(self, t): - return Freestyle.evaluateCurveMappingF(self.__curve, 0, t) + return freestyle.evaluateCurveMappingF(self.__curve, 0, t) def evaluate(self, t): return self.__mapping(t) class ThicknessModifierMixIn: def __init__(self): - scene = Freestyle.getCurrentScene() + scene = freestyle.getCurrentScene() self.__persp_camera = (scene.camera.data.type == "PERSP") def set_thickness(self, sv, outer, inner): fe = sv.first_svertex.get_fedge(sv.second_svertex) @@ -280,7 +280,7 @@ class ThicknessDistanceFromCameraShader(ThicknessBlenderMixIn, CurveMappingModif # Distance from Object modifiers def iter_distance_from_object(stroke, object, range_min, range_max): - scene = Freestyle.getCurrentScene() + scene = freestyle.getCurrentScene() mv = scene.camera.matrix_world.copy() # model-view matrix mv.invert() loc = mv * object.location # loc in the camera coordinate @@ -976,7 +976,7 @@ _seed = Seed() # main function for parameter processing def process(layer_name, lineset_name): - scene = Freestyle.getCurrentScene() + scene = freestyle.getCurrentScene() layer = scene.render.layers[layer_name] lineset = layer.freestyle_settings.linesets[lineset_name] linestyle = lineset.linestyle diff --git a/release/scripts/freestyle/style_modules/polygonalize.py b/release/scripts/freestyle/style_modules/polygonalize.py index 092efbb2df1..e570e15ca6c 100644 --- a/release/scripts/freestyle/style_modules/polygonalize.py +++ b/release/scripts/freestyle/style_modules/polygonalize.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Make the strokes more "polygonal" -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, PolygonalizationShader, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/qi0.py b/release/scripts/freestyle/style_modules/qi0.py index 3badf818566..8386817754a 100644 --- a/release/scripts/freestyle/style_modules/qi0.py +++ b/release/scripts/freestyle/style_modules/qi0.py @@ -22,7 +22,7 @@ # Purpose : Draws the visible lines (chaining follows same nature lines) # (most basic style module) -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/qi0_not_external_contour.py b/release/scripts/freestyle/style_modules/qi0_not_external_contour.py index 20860b36aa3..6315f1291d4 100644 --- a/release/scripts/freestyle/style_modules/qi0_not_external_contour.py +++ b/release/scripts/freestyle/style_modules/qi0_not_external_contour.py @@ -22,7 +22,7 @@ # Purpose : Draws the visible lines (chaining follows same nature lines) # that do not belong to the external contour of the scene -from Freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ExternalContourUP1D, \ +from freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ExternalContourUP1D, \ IncreasingColorShader, IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, \ SamplingShader, SpatialNoiseShader, TextureAssignerShader, TrueUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/qi1.py b/release/scripts/freestyle/style_modules/qi1.py index 7ab86b67c86..d5424b37748 100644 --- a/release/scripts/freestyle/style_modules/qi1.py +++ b/release/scripts/freestyle/style_modules/qi1.py @@ -23,7 +23,7 @@ # *** Quantitative Invisibility must have been # enabled in the options dialog to use this style module **** -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/qi2.py b/release/scripts/freestyle/style_modules/qi2.py index 510a22e3e07..367139de2e2 100644 --- a/release/scripts/freestyle/style_modules/qi2.py +++ b/release/scripts/freestyle/style_modules/qi2.py @@ -23,7 +23,7 @@ # *** Quantitative Invisibility must have been # enabled in the options dialog to use this style module **** -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py b/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py index 966e5ddf129..755098d96b6 100644 --- a/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py +++ b/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py @@ -23,7 +23,7 @@ # predicates to specify respectively the starting and # the stopping extremities for strokes -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, Nature, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, Nature, \ Operators, QuantitativeInvisibilityUP1D, SpatialNoiseShader, TextureAssignerShader, TrueUP1D from PredicatesU0D import pyBackTVertexUP0D, pyVertexNatureUP0D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/shaders.py b/release/scripts/freestyle/style_modules/shaders.py index b955b9d4d08..ed51c1b1a41 100644 --- a/release/scripts/freestyle/style_modules/shaders.py +++ b/release/scripts/freestyle/style_modules/shaders.py @@ -21,10 +21,10 @@ # Date : 11/08/2005 # Purpose : Stroke shaders to be used for creation of stylized strokes -from Freestyle import AdjacencyIterator, Curvature2DAngleF0D, DensityF0D, GetProjectedZF0D, \ +from freestyle import AdjacencyIterator, Curvature2DAngleF0D, DensityF0D, GetProjectedZF0D, \ Interface0DIterator, MaterialF0D, Nature, Noise, Normal2DF0D, Orientation2DF1D, \ StrokeAttribute, StrokeShader, StrokeVertexIterator, ZDiscontinuityF0D -from Freestyle import ContextFunctions as CF +from freestyle import ContextFunctions as CF from PredicatesU0D import pyVertexNatureUP0D import math diff --git a/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py b/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py index e10b0c32b55..c1cc4361f7f 100644 --- a/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py +++ b/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py @@ -24,7 +24,7 @@ # whereas only the visible portions are actually drawn from ChainingIterators import pySketchyChainSilhouetteIterator -from Freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ +from freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ TextureAssignerShader, TrueUP1D from shaders import pyHLRShader diff --git a/release/scripts/freestyle/style_modules/sketchy_topology_broken.py b/release/scripts/freestyle/style_modules/sketchy_topology_broken.py index 7c99946c813..27669d20a4e 100644 --- a/release/scripts/freestyle/style_modules/sketchy_topology_broken.py +++ b/release/scripts/freestyle/style_modules/sketchy_topology_broken.py @@ -24,7 +24,7 @@ # and, second, so as to chain several times the same ViewEdge. from ChainingIterators import pySketchyChainingIterator -from Freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ +from freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ TextureAssignerShader, TrueUP1D from shaders import pyBackboneStretcherNoCuspShader diff --git a/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py b/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py index 4b525b97f04..25e593b7c99 100644 --- a/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py +++ b/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py @@ -24,7 +24,7 @@ # The topology of the objects is preserved from ChainingIterators import pySketchyChainSilhouetteIterator -from Freestyle import ConstantColorShader, IncreasingThicknessShader, Operators, \ +from freestyle import ConstantColorShader, IncreasingThicknessShader, Operators, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ TextureAssignerShader, TrueUP1D diff --git a/release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py b/release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py index 4e635bc4eee..474183c3810 100644 --- a/release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py +++ b/release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py @@ -22,7 +22,7 @@ # Purpose : Draws the visible lines (chaining follows same nature lines) # (most basic style module) -from Freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \ +from freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \ Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D from Functions0D import pyInverseCurvature2DAngleF0D from PredicatesU0D import pyParameterUP0D diff --git a/release/scripts/freestyle/style_modules/split_at_tvertices.py b/release/scripts/freestyle/style_modules/split_at_tvertices.py index 122b79450c6..70446e0178e 100644 --- a/release/scripts/freestyle/style_modules/split_at_tvertices.py +++ b/release/scripts/freestyle/style_modules/split_at_tvertices.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws strokes that starts and stops at Tvertices (visible or not) -from Freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \ +from freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \ Nature, Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D from PredicatesU0D import pyVertexNatureUP0D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/stroke_texture.py b/release/scripts/freestyle/style_modules/stroke_texture.py index 07fce377866..c925633b579 100644 --- a/release/scripts/freestyle/style_modules/stroke_texture.py +++ b/release/scripts/freestyle/style_modules/stroke_texture.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Draws textured strokes (illustrate the StrokeTextureShader shader) -from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ +from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ ConstantThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ Stroke, StrokeTextureShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/suggestive.py b/release/scripts/freestyle/style_modules/suggestive.py index 3d0e031acc9..bb5e20f2a2e 100644 --- a/release/scripts/freestyle/style_modules/suggestive.py +++ b/release/scripts/freestyle/style_modules/suggestive.py @@ -23,7 +23,7 @@ # ***** The suggestive contours must be enabled # in the options dialog ***** -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ Nature, Operators, QuantitativeInvisibilityUP1D, TrueUP1D from PredicatesU1D import pyNatureUP1D from logical_operators import AndUP1D, NotUP1D diff --git a/release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py b/release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py index 9dff325bb00..20c8240b3cd 100644 --- a/release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py +++ b/release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Assigns to strokes a thickness that depends on the depth discontinuity -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D from shaders import pyDepthDiscontinuityThicknessShader diff --git a/release/scripts/freestyle/style_modules/tipremover.py b/release/scripts/freestyle/style_modules/tipremover.py index 92918840bec..efcddb7321f 100644 --- a/release/scripts/freestyle/style_modules/tipremover.py +++ b/release/scripts/freestyle/style_modules/tipremover.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Removes strokes extremities -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TipRemoverShader, TrueUP1D from logical_operators import NotUP1D diff --git a/release/scripts/freestyle/style_modules/tvertex_remover.py b/release/scripts/freestyle/style_modules/tvertex_remover.py index 962425fa009..565962c1b0e 100644 --- a/release/scripts/freestyle/style_modules/tvertex_remover.py +++ b/release/scripts/freestyle/style_modules/tvertex_remover.py @@ -21,7 +21,7 @@ # Date : 04/08/2005 # Purpose : Removes TVertices -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D from logical_operators import NotUP1D from shaders import pyTVertexRemoverShader diff --git a/release/scripts/freestyle/style_modules/uniformpruning_zsort.py b/release/scripts/freestyle/style_modules/uniformpruning_zsort.py index b9fcb33e895..efa977ccf5f 100644 --- a/release/scripts/freestyle/style_modules/uniformpruning_zsort.py +++ b/release/scripts/freestyle/style_modules/uniformpruning_zsort.py @@ -20,7 +20,7 @@ # Authors : Fredo Durand, Stephane Grabli, Francois Sillion, Emmanuel Turquin # Date : 08/04/2005 -from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ +from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, Stroke, StrokeTextureShader from PredicatesB1D import pyZBP1D from PredicatesU1D import pyDensityUP1D |