Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use lowercase name for freestyle module (as with all other blender modules).

Browse Source
This commit is contained in:
Campbell Barton
2013-04-07 11:22:54 +00:00
parent 7b7ba9ba07
commit eb495b2a8a
50 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/python_api/sphinx_doc_gen.py
View File

@@ -262,7 +262,7 @@ else:
"mathutils", "mathutils",
"mathutils.geometry", "mathutils.geometry",
"mathutils.noise", "mathutils.noise",
"Freestyle", "freestyle",
] ]
# ------ # ------
@@ -1555,7 +1555,7 @@ def write_rst_contents(basepath):
# mathutils # mathutils
"mathutils", "mathutils.geometry", "mathutils.noise", "mathutils", "mathutils.geometry", "mathutils.noise",
# misc # misc
"Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras", "freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras",
# bmesh, submodules are in own page # bmesh, submodules are in own page
"bmesh", "bmesh",
) )
@@ -1703,7 +1703,7 @@ def write_rst_importable_modules(basepath):
"mathutils" : "Math Types & Utilities", "mathutils" : "Math Types & Utilities",
"mathutils.geometry": "Geometry Utilities", "mathutils.geometry": "Geometry Utilities",
"mathutils.noise" : "Noise Utilities", "mathutils.noise" : "Noise Utilities",
"Freestyle" : "Freestyle Data Types & Operators", "freestyle" : "Freestyle Data Types & Operators",
} }
for mod_name, mod_descr in importable_modules.items(): for mod_name, mod_descr in importable_modules.items():
if mod_name not in EXCLUDE_MODULES: if mod_name not in EXCLUDE_MODULES:

4
release/scripts/freestyle/style_modules/ChainingIterators.py
View File

@@ -21,8 +21,8 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Chaining Iterators to be used with chaining operators # Purpose : Chaining Iterators to be used with chaining operators
from Freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex from freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex
from Freestyle import ContextFunctions as CF from freestyle import ContextFunctions as CF
## the natural chaining iterator ## the natural chaining iterator
## It follows the edges of same nature following the topology of ## It follows the edges of same nature following the topology of

4
release/scripts/freestyle/style_modules/Functions0D.py
View File

@@ -21,10 +21,10 @@
# Date : 30/06/2005 # Date : 30/06/2005
# Purpose : Functions (functors) to be used for 0D elements # Purpose : Functions (functors) to be used for 0D elements
from Freestyle import Curvature2DAngleF0D, CurvePoint, ReadCompleteViewMapPixelF0D, \ from freestyle import Curvature2DAngleF0D, CurvePoint, ReadCompleteViewMapPixelF0D, \
ReadSteerableViewMapPixelF0D, UnaryFunction0DDouble, UnaryFunction0DMaterial, \ ReadSteerableViewMapPixelF0D, UnaryFunction0DDouble, UnaryFunction0DMaterial, \
UnaryFunction0DVec2f UnaryFunction0DVec2f
from Freestyle import ContextFunctions as CF from freestyle import ContextFunctions as CF
import math import math
import mathutils import mathutils

2
release/scripts/freestyle/style_modules/Functions1D.py
View File

@@ -21,7 +21,7 @@
# Date : 08/04/2005 # Date : 08/04/2005
# Purpose : Functions (functors) to be used for 1D elements # 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 from Functions0D import pyDensityAnisotropyF0D, pyViewMapGradientNormF0D
import string import string

2
release/scripts/freestyle/style_modules/PredicatesB1D.py
View File

@@ -21,7 +21,7 @@
# Date : 08/04/2005 # Date : 08/04/2005
# Purpose : Binary predicates (functors) to be used for 1D elements # 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 from Functions1D import pyViewMapGradientNormF1D
import random import random

2
release/scripts/freestyle/style_modules/PredicatesU0D.py
View File

@@ -21,7 +21,7 @@
# Date : 08/04/2005 # Date : 08/04/2005
# Purpose : Unary predicates (functors) to be used for 0D elements # 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 from Functions0D import pyCurvilinearLengthF0D
class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D): class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D):

2
release/scripts/freestyle/style_modules/PredicatesU1D.py
View File

@@ -21,7 +21,7 @@
# Date : 08/04/2005 # Date : 08/04/2005
# Purpose : Unary predicates (functors) to be used for 1D elements # 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, \ GetDirectionalViewMapDensityF1D, GetOccludersF1D, GetProjectedZF1D, GetShapeF1D, GetSteerableViewMapDensityF1D, \
IntegrationType, ShapeUP1D, TVertex, UnaryPredicate1D IntegrationType, ShapeUP1D, TVertex, UnaryPredicate1D
from Functions1D import pyDensityAnisotropyF1D, pyViewMapGradientNormF1D from Functions1D import pyDensityAnisotropyF1D, pyViewMapGradientNormF1D

2
release/scripts/freestyle/style_modules/anisotropic_diffusion.py
View File

@@ -21,7 +21,7 @@
# Date : 12/08/2004 # Date : 12/08/2004
# Purpose : Smoothes lines using an anisotropic diffusion scheme # 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 Operators, QuantitativeInvisibilityUP1D, SamplingShader, Stroke, StrokeTextureShader, TrueBP1D, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D
from shaders import pyDiffusion2Shader from shaders import pyDiffusion2Shader

2
release/scripts/freestyle/style_modules/apriori_and_causal_density.py
View File

@@ -23,7 +23,7 @@
# subjects them to the causal density so as to avoid # subjects them to the causal density so as to avoid
# cluttering # cluttering
from Freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ from freestyle import ChainPredicateIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \
Operators, QuantitativeInvisibilityUP1D, TrueBP1D Operators, QuantitativeInvisibilityUP1D, TrueBP1D
from PredicatesU1D import pyDensityUP1D, pyHighViewMapDensityUP1D from PredicatesU1D import pyDensityUP1D, pyHighViewMapDensityUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/apriori_density.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws lines having a high a priori density # 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 QuantitativeInvisibilityUP1D, TrueBP1D, TrueUP1D
from PredicatesU1D import pyHighViewMapDensityUP1D from PredicatesU1D import pyHighViewMapDensityUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/backbone_stretcher.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Stretches the geometry of visible lines # Purpose : Stretches the geometry of visible lines
from Freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ConstantColorShader, \ from freestyle import BackboneStretcherShader, ChainSilhouetteIterator, ConstantColorShader, \
Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/blueprint_circles.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Produces a blueprint using circular contour strokes # 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 Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D
from PredicatesU1D import pyHigherLengthUP1D from PredicatesU1D import pyHigherLengthUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/blueprint_ellipses.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Produces a blueprint using elliptic contour strokes # 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 Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D
from PredicatesU1D import pyHigherLengthUP1D from PredicatesU1D import pyHigherLengthUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/blueprint_squares.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Produces a blueprint using square contour strokes # 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 Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TextureAssignerShader, TrueUP1D
from PredicatesU1D import pyHigherLengthUP1D from PredicatesU1D import pyHigherLengthUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/cartoon.py
View File

@@ -23,7 +23,7 @@
# infered from each object's material in a cartoon-like # infered from each object's material in a cartoon-like
# fashion. # fashion.
from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, TrueUP1D QuantitativeInvisibilityUP1D, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D
from shaders import pyMaterialColorShader from shaders import pyMaterialColorShader

2
release/scripts/freestyle/style_modules/contour.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws each object's visible contour # 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 Operators, QuantitativeInvisibilityUP1D, SameShapeIdBP1D, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/curvature2d.py
View File

@@ -22,7 +22,7 @@
# Purpose : The stroke points are colored in gray levels and depending # Purpose : The stroke points are colored in gray levels and depending
# on the 2d curvature value # on the 2d curvature value
from Freestyle import ChainSilhouetteIterator, ConstantThicknessShader, Operators, \ from freestyle import ChainSilhouetteIterator, ConstantThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, Stroke, StrokeTextureShader, TrueUP1D QuantitativeInvisibilityUP1D, Stroke, StrokeTextureShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D
from shaders import py2DCurvatureColorShader from shaders import py2DCurvatureColorShader

2
release/scripts/freestyle/style_modules/external_contour.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws the external contour of the scene # 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 ExternalContourUP1D, Operators, QuantitativeInvisibilityUP1D, TrueBP1D, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/external_contour_sketchy.py
View File

@@ -24,7 +24,7 @@
# several times # several times
from ChainingIterators import pySketchyChainingIterator from ChainingIterators import pySketchyChainingIterator
from Freestyle import ExternalContourUP1D, IncreasingColorShader, IncreasingThicknessShader, \ from freestyle import ExternalContourUP1D, IncreasingColorShader, IncreasingThicknessShader, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ Operators, QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \
TextureAssignerShader, TrueUP1D TextureAssignerShader, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/external_contour_smooth.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws a smooth external contour # Purpose : Draws a smooth external contour
from Freestyle import ChainPredicateIterator, ExternalContourUP1D, IncreasingColorShader, \ from freestyle import ChainPredicateIterator, ExternalContourUP1D, IncreasingColorShader, \
IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \
SmoothingShader, TrueBP1D, TrueUP1D SmoothingShader, TrueBP1D, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/haloing.py
View File

@@ -24,7 +24,7 @@
# object and trims them in order to produce # object and trims them in order to produce
# a haloing effect around the target shape # 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 Operators, QuantitativeInvisibilityUP1D, SamplingShader, TipRemoverShader, TrueUP1D
from PredicatesU1D import pyIsOccludedByUP1D from PredicatesU1D import pyIsOccludedByUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/ignore_small_occlusions.py
View File

@@ -22,7 +22,7 @@
# Purpose : The strokes are drawn through small occlusions # Purpose : The strokes are drawn through small occlusions
from ChainingIterators import pyFillOcclusionsAbsoluteChainingIterator from ChainingIterators import pyFillOcclusionsAbsoluteChainingIterator
from Freestyle import ConstantColorShader, ConstantThicknessShader, Operators, \ from freestyle import ConstantColorShader, ConstantThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
Operators.select(QuantitativeInvisibilityUP1D(0)) Operators.select(QuantitativeInvisibilityUP1D(0))

2
release/scripts/freestyle/style_modules/invisible_lines.py
View File

@@ -22,7 +22,7 @@
# Purpose : Draws all lines whose Quantitative Invisibility # Purpose : Draws all lines whose Quantitative Invisibility
# is different from 0 # is different from 0
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/japanese_bigbrush.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Simulates a big brush fr oriental painting # Purpose : Simulates a big brush fr oriental painting
from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \
ConstantThicknessShader, IntegrationType, Operators, QuantitativeInvisibilityUP1D, \ ConstantThicknessShader, IntegrationType, Operators, QuantitativeInvisibilityUP1D, \
SamplingShader, TextureAssignerShader, TipRemoverShader SamplingShader, TextureAssignerShader, TipRemoverShader
from Functions0D import pyInverseCurvature2DAngleF0D from Functions0D import pyInverseCurvature2DAngleF0D

2
release/scripts/freestyle/style_modules/logical_operators.py
View File

@@ -21,7 +21,7 @@
# Date : 08/04/2005 # Date : 08/04/2005
# Purpose : Logical unary predicates (functors) for 1D elements # Purpose : Logical unary predicates (functors) for 1D elements
from Freestyle import UnaryPredicate1D from freestyle import UnaryPredicate1D
class AndUP1D(UnaryPredicate1D): class AndUP1D(UnaryPredicate1D):
def __init__(self, pred1, pred2): def __init__(self, pred1, pred2):

2
release/scripts/freestyle/style_modules/long_anisotropically_dense.py
View File

@@ -28,7 +28,7 @@
# ******** The Directional a priori density maps must ****** # ******** The Directional a priori density maps must ******
# ******** have been computed prior to using this style module ****** # ******** 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 IntegrationType, Operators, QuantitativeInvisibilityUP1D, SamplingShader, UnaryPredicate1D
from PredicatesB1D import pyLengthBP1D from PredicatesB1D import pyLengthBP1D
from PredicatesU1D import pyHighDensityAnisotropyUP1D, pyHigherLengthUP1D from PredicatesU1D import pyHighDensityAnisotropyUP1D, pyHigherLengthUP1D

2
release/scripts/freestyle/style_modules/multiple_parameterization.py
View File

@@ -27,7 +27,7 @@
# the strokes using a second parameterization that only # the strokes using a second parameterization that only
# covers the visible portions. # covers the visible portions.
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingColorShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingColorShader, \
IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \
TextureAssignerShader, TrueUP1D TextureAssignerShader, TrueUP1D
from shaders import pyHLRShader from shaders import pyHLRShader

2
release/scripts/freestyle/style_modules/nature.py
View File

@@ -25,7 +25,7 @@
# The suggestive contours must have been enabled in the # The suggestive contours must have been enabled in the
# options dialog to appear in the View Map. # options dialog to appear in the View Map.
from Freestyle import ChainSilhouetteIterator, IncreasingColorShader, \ from freestyle import ChainSilhouetteIterator, IncreasingColorShader, \
IncreasingThicknessShader, Nature, Operators, TrueUP1D IncreasingThicknessShader, Nature, Operators, TrueUP1D
from PredicatesU1D import pyNatureUP1D from PredicatesU1D import pyNatureUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/near_lines.py
View File

@@ -22,7 +22,7 @@
# Purpose : Draws the lines that are "closer" than a threshold # Purpose : Draws the lines that are "closer" than a threshold
# (between 0 and 1) # (between 0 and 1)
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \
IntegrationType, Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D IntegrationType, Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D
from PredicatesU1D import pyZSmallerUP1D from PredicatesU1D import pyZSmallerUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/occluded_by_specific_object.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws only the lines that are occluded by a given object # 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 Id, Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from PredicatesU1D import pyIsInOccludersListUP1D from PredicatesU1D import pyIsInOccludersListUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

16
release/scripts/freestyle/style_modules/parameter_editor.py
View File

@@ -21,13 +21,13 @@
# Date : 26/07/2010 # Date : 26/07/2010
# Purpose : Interactive manipulation of stylization parameters # Purpose : Interactive manipulation of stylization parameters
import Freestyle import freestyle
import math import math
import mathutils import mathutils
import time import time
from ChainingIterators import pySketchyChainSilhouetteIterator, pySketchyChainingIterator from ChainingIterators import pySketchyChainSilhouetteIterator, pySketchyChainingIterator
from Freestyle import BackboneStretcherShader, BezierCurveShader, BinaryPredicate1D, ChainPredicateIterator, \ from freestyle import BackboneStretcherShader, BezierCurveShader, BinaryPredicate1D, ChainPredicateIterator, \
ChainSilhouetteIterator, ConstantColorShader, ContourUP1D, Curvature2DAngleF0D, ExternalContourUP1D, \ ChainSilhouetteIterator, ConstantColorShader, ContourUP1D, Curvature2DAngleF0D, ExternalContourUP1D, \
FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \ FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \
PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \ PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \
@@ -45,11 +45,11 @@ class ColorRampModifier(StrokeShader):
self.__influence = influence self.__influence = influence
self.__ramp = ramp self.__ramp = ramp
def evaluate(self, t): def evaluate(self, t):
col = Freestyle.evaluateColorRamp(self.__ramp, t) col = freestyle.evaluateColorRamp(self.__ramp, t)
col = col.xyz # omit alpha col = col.xyz # omit alpha
return col return col
def blend_ramp(self, a, b): 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): class ScalarBlendModifier(StrokeShader):
def __init__(self, blend, influence): def __init__(self, blend, influence):
@@ -96,13 +96,13 @@ class CurveMappingModifier(ScalarBlendModifier):
return 1.0 - t return 1.0 - t
return t return t
def CURVE(self, t): def CURVE(self, t):
return Freestyle.evaluateCurveMappingF(self.__curve, 0, t) return freestyle.evaluateCurveMappingF(self.__curve, 0, t)
def evaluate(self, t): def evaluate(self, t):
return self.__mapping(t) return self.__mapping(t)
class ThicknessModifierMixIn: class ThicknessModifierMixIn:
def __init__(self): def __init__(self):
scene = Freestyle.getCurrentScene() scene = freestyle.getCurrentScene()
self.__persp_camera = (scene.camera.data.type == "PERSP") self.__persp_camera = (scene.camera.data.type == "PERSP")
def set_thickness(self, sv, outer, inner): def set_thickness(self, sv, outer, inner):
fe = sv.first_svertex.get_fedge(sv.second_svertex) fe = sv.first_svertex.get_fedge(sv.second_svertex)
@@ -280,7 +280,7 @@ class ThicknessDistanceFromCameraShader(ThicknessBlenderMixIn, CurveMappingModif
# Distance from Object modifiers # Distance from Object modifiers
def iter_distance_from_object(stroke, object, range_min, range_max): 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 = scene.camera.matrix_world.copy() # model-view matrix
mv.invert() mv.invert()
loc = mv * object.location # loc in the camera coordinate loc = mv * object.location # loc in the camera coordinate
@@ -976,7 +976,7 @@ _seed = Seed()
# main function for parameter processing # main function for parameter processing
def process(layer_name, lineset_name): def process(layer_name, lineset_name):
scene = Freestyle.getCurrentScene() scene = freestyle.getCurrentScene()
layer = scene.render.layers[layer_name] layer = scene.render.layers[layer_name]
lineset = layer.freestyle_settings.linesets[lineset_name] lineset = layer.freestyle_settings.linesets[lineset_name]
linestyle = lineset.linestyle linestyle = lineset.linestyle

2
release/scripts/freestyle/style_modules/polygonalize.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Make the strokes more "polygonal" # Purpose : Make the strokes more "polygonal"
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \
Operators, PolygonalizationShader, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D Operators, PolygonalizationShader, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/qi0.py
View File

@@ -22,7 +22,7 @@
# Purpose : Draws the visible lines (chaining follows same nature lines) # Purpose : Draws the visible lines (chaining follows same nature lines)
# (most basic style module) # (most basic style module)
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/qi0_not_external_contour.py
View File

@@ -22,7 +22,7 @@
# Purpose : Draws the visible lines (chaining follows same nature lines) # Purpose : Draws the visible lines (chaining follows same nature lines)
# that do not belong to the external contour of the scene # 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, \ IncreasingColorShader, IncreasingThicknessShader, Operators, QuantitativeInvisibilityUP1D, \
SamplingShader, SpatialNoiseShader, TextureAssignerShader, TrueUP1D SamplingShader, SpatialNoiseShader, TextureAssignerShader, TrueUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/qi1.py
View File

@@ -23,7 +23,7 @@
# *** Quantitative Invisibility must have been # *** Quantitative Invisibility must have been
# enabled in the options dialog to use this style module **** # 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 Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/qi2.py
View File

@@ -23,7 +23,7 @@
# *** Quantitative Invisibility must have been # *** Quantitative Invisibility must have been
# enabled in the options dialog to use this style module **** # 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 Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py
View File

@@ -23,7 +23,7 @@
# predicates to specify respectively the starting and # predicates to specify respectively the starting and
# the stopping extremities for strokes # the stopping extremities for strokes
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, Nature, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, Nature, \
Operators, QuantitativeInvisibilityUP1D, SpatialNoiseShader, TextureAssignerShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, SpatialNoiseShader, TextureAssignerShader, TrueUP1D
from PredicatesU0D import pyBackTVertexUP0D, pyVertexNatureUP0D from PredicatesU0D import pyBackTVertexUP0D, pyVertexNatureUP0D
from logical_operators import NotUP1D from logical_operators import NotUP1D

4
release/scripts/freestyle/style_modules/shaders.py
View File

@@ -21,10 +21,10 @@
# Date : 11/08/2005 # Date : 11/08/2005
# Purpose : Stroke shaders to be used for creation of stylized strokes # 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, \ Interface0DIterator, MaterialF0D, Nature, Noise, Normal2DF0D, Orientation2DF1D, \
StrokeAttribute, StrokeShader, StrokeVertexIterator, ZDiscontinuityF0D StrokeAttribute, StrokeShader, StrokeVertexIterator, ZDiscontinuityF0D
from Freestyle import ContextFunctions as CF from freestyle import ContextFunctions as CF
from PredicatesU0D import pyVertexNatureUP0D from PredicatesU0D import pyVertexNatureUP0D
import math import math

2
release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py
View File

@@ -24,7 +24,7 @@
# whereas only the visible portions are actually drawn # whereas only the visible portions are actually drawn
from ChainingIterators import pySketchyChainSilhouetteIterator from ChainingIterators import pySketchyChainSilhouetteIterator
from Freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ from freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \
TextureAssignerShader, TrueUP1D TextureAssignerShader, TrueUP1D
from shaders import pyHLRShader from shaders import pyHLRShader

2
release/scripts/freestyle/style_modules/sketchy_topology_broken.py
View File

@@ -24,7 +24,7 @@
# and, second, so as to chain several times the same ViewEdge. # and, second, so as to chain several times the same ViewEdge.
from ChainingIterators import pySketchyChainingIterator from ChainingIterators import pySketchyChainingIterator
from Freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \ from freestyle import IncreasingColorShader, IncreasingThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \
TextureAssignerShader, TrueUP1D TextureAssignerShader, TrueUP1D
from shaders import pyBackboneStretcherNoCuspShader from shaders import pyBackboneStretcherNoCuspShader

2
release/scripts/freestyle/style_modules/sketchy_topology_preserved.py
View File

@@ -24,7 +24,7 @@
# The topology of the objects is preserved # The topology of the objects is preserved
from ChainingIterators import pySketchyChainSilhouetteIterator from ChainingIterators import pySketchyChainSilhouetteIterator
from Freestyle import ConstantColorShader, IncreasingThicknessShader, Operators, \ from freestyle import ConstantColorShader, IncreasingThicknessShader, Operators, \
QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \ QuantitativeInvisibilityUP1D, SamplingShader, SmoothingShader, SpatialNoiseShader, \
TextureAssignerShader, TrueUP1D TextureAssignerShader, TrueUP1D

2
release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py
View File

@@ -22,7 +22,7 @@
# Purpose : Draws the visible lines (chaining follows same nature lines) # Purpose : Draws the visible lines (chaining follows same nature lines)
# (most basic style module) # (most basic style module)
from Freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \ from freestyle import ChainSilhouetteIterator, ConstantThicknessShader, IncreasingColorShader, \
Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D
from Functions0D import pyInverseCurvature2DAngleF0D from Functions0D import pyInverseCurvature2DAngleF0D
from PredicatesU0D import pyParameterUP0D from PredicatesU0D import pyParameterUP0D

2
release/scripts/freestyle/style_modules/split_at_tvertices.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws strokes that starts and stops at Tvertices (visible or not) # 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 Nature, Operators, QuantitativeInvisibilityUP1D, TextureAssignerShader, TrueUP1D
from PredicatesU0D import pyVertexNatureUP0D from PredicatesU0D import pyVertexNatureUP0D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/stroke_texture.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Draws textured strokes (illustrate the StrokeTextureShader shader) # Purpose : Draws textured strokes (illustrate the StrokeTextureShader shader)
from Freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \ from freestyle import BezierCurveShader, ChainSilhouetteIterator, ConstantColorShader, \
ConstantThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \ ConstantThicknessShader, Operators, QuantitativeInvisibilityUP1D, SamplingShader, \
Stroke, StrokeTextureShader, TrueUP1D Stroke, StrokeTextureShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/suggestive.py
View File

@@ -23,7 +23,7 @@
# ***** The suggestive contours must be enabled # ***** The suggestive contours must be enabled
# in the options dialog ***** # in the options dialog *****
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \
Nature, Operators, QuantitativeInvisibilityUP1D, TrueUP1D Nature, Operators, QuantitativeInvisibilityUP1D, TrueUP1D
from PredicatesU1D import pyNatureUP1D from PredicatesU1D import pyNatureUP1D
from logical_operators import AndUP1D, NotUP1D from logical_operators import AndUP1D, NotUP1D

2
release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Assigns to strokes a thickness that depends on the depth discontinuity # 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 Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D
from shaders import pyDepthDiscontinuityThicknessShader from shaders import pyDepthDiscontinuityThicknessShader

2
release/scripts/freestyle/style_modules/tipremover.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Removes strokes extremities # Purpose : Removes strokes extremities
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, TipRemoverShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, SamplingShader, TipRemoverShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D

2
release/scripts/freestyle/style_modules/tvertex_remover.py
View File

@@ -21,7 +21,7 @@
# Date : 04/08/2005 # Date : 04/08/2005
# Purpose : Removes TVertices # Purpose : Removes TVertices
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, IncreasingThicknessShader, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D Operators, QuantitativeInvisibilityUP1D, SamplingShader, TrueUP1D
from logical_operators import NotUP1D from logical_operators import NotUP1D
from shaders import pyTVertexRemoverShader from shaders import pyTVertexRemoverShader

2
release/scripts/freestyle/style_modules/uniformpruning_zsort.py
View File

@@ -20,7 +20,7 @@
# Authors : Fredo Durand, Stephane Grabli, Francois Sillion, Emmanuel Turquin # Authors : Fredo Durand, Stephane Grabli, Francois Sillion, Emmanuel Turquin
# Date : 08/04/2005 # Date : 08/04/2005
from Freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \ from freestyle import ChainSilhouetteIterator, ConstantColorShader, ConstantThicknessShader, IntegrationType, \
Operators, QuantitativeInvisibilityUP1D, SamplingShader, Stroke, StrokeTextureShader Operators, QuantitativeInvisibilityUP1D, SamplingShader, Stroke, StrokeTextureShader
from PredicatesB1D import pyZBP1D from PredicatesB1D import pyZBP1D
from PredicatesU1D import pyDensityUP1D from PredicatesU1D import pyDensityUP1D

2
source/blender/freestyle/intern/python/BPy_Freestyle.cpp
View File

@@ -482,7 +482,7 @@ static PyMethodDef module_functions[] = {
static PyModuleDef module_definition = { static PyModuleDef module_definition = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
"Freestyle", "freestyle",
module_docstring, module_docstring,
-1, -1,
module_functions module_functions