[Bf-blender-cvs] [0b22827] master: Moved the Operators class from the 'freestyle' module to the 'freestyle.types' submodule.
Tamito Kajiyama
noreply at git.blender.org
Tue Jan 28 15:38:17 CET 2014
Commit: 0b228270338234cc46985b13aea839d48d483dba
Author: Tamito Kajiyama
Date: Mon Dec 30 23:43:47 2013 +0900
https://developer.blender.org/rB0b228270338234cc46985b13aea839d48d483dba
Moved the Operators class from the 'freestyle' module to the 'freestyle.types' submodule.
===================================================================
M release/scripts/freestyle/modules/freestyle/__init__.py
M release/scripts/freestyle/modules/freestyle/types.py
M release/scripts/freestyle/modules/parameter_editor.py
M release/scripts/freestyle/styles/anisotropic_diffusion.py
M release/scripts/freestyle/styles/apriori_and_causal_density.py
M release/scripts/freestyle/styles/apriori_density.py
M release/scripts/freestyle/styles/backbone_stretcher.py
M release/scripts/freestyle/styles/blueprint_circles.py
M release/scripts/freestyle/styles/blueprint_ellipses.py
M release/scripts/freestyle/styles/blueprint_squares.py
M release/scripts/freestyle/styles/cartoon.py
M release/scripts/freestyle/styles/contour.py
M release/scripts/freestyle/styles/curvature2d.py
M release/scripts/freestyle/styles/external_contour.py
M release/scripts/freestyle/styles/external_contour_sketchy.py
M release/scripts/freestyle/styles/external_contour_smooth.py
M release/scripts/freestyle/styles/haloing.py
M release/scripts/freestyle/styles/ignore_small_occlusions.py
M release/scripts/freestyle/styles/invisible_lines.py
M release/scripts/freestyle/styles/japanese_bigbrush.py
M release/scripts/freestyle/styles/long_anisotropically_dense.py
M release/scripts/freestyle/styles/multiple_parameterization.py
M release/scripts/freestyle/styles/nature.py
M release/scripts/freestyle/styles/near_lines.py
M release/scripts/freestyle/styles/occluded_by_specific_object.py
M release/scripts/freestyle/styles/polygonalize.py
M release/scripts/freestyle/styles/qi0.py
M release/scripts/freestyle/styles/qi0_not_external_contour.py
M release/scripts/freestyle/styles/qi1.py
M release/scripts/freestyle/styles/qi2.py
M release/scripts/freestyle/styles/sequentialsplit_sketchy.py
M release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
M release/scripts/freestyle/styles/sketchy_topology_broken.py
M release/scripts/freestyle/styles/sketchy_topology_preserved.py
M release/scripts/freestyle/styles/split_at_highest_2d_curvatures.py
M release/scripts/freestyle/styles/split_at_tvertices.py
M release/scripts/freestyle/styles/stroke_texture.py
M release/scripts/freestyle/styles/suggestive.py
M release/scripts/freestyle/styles/thickness_fof_depth_discontinuity.py
M release/scripts/freestyle/styles/tipremover.py
M release/scripts/freestyle/styles/tvertex_remover.py
M release/scripts/freestyle/styles/uniformpruning_zsort.py
===================================================================
diff --git a/release/scripts/freestyle/modules/freestyle/__init__.py b/release/scripts/freestyle/modules/freestyle/__init__.py
index dc98a26..5874488 100644
--- a/release/scripts/freestyle/modules/freestyle/__init__.py
+++ b/release/scripts/freestyle/modules/freestyle/__init__.py
@@ -21,5 +21,4 @@ Top-level module containing all Freestyle stylization constructs
"""
# module members
-from _freestyle import Operators
from . import chainingiterators, functions, predicates, shaders, types, utils
diff --git a/release/scripts/freestyle/modules/freestyle/types.py b/release/scripts/freestyle/modules/freestyle/types.py
index 8fdacf1..470b7ae 100644
--- a/release/scripts/freestyle/modules/freestyle/types.py
+++ b/release/scripts/freestyle/modules/freestyle/types.py
@@ -45,12 +45,13 @@ from _freestyle import (
Nature,
Noise,
NonTVertex,
+ Operators,
SShape,
SVertex,
SVertexIterator,
Stroke,
- StrokeShader,
StrokeAttribute,
+ StrokeShader,
StrokeVertex,
StrokeVertexIterator,
TVertex,
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py
index 8065cfe..80a8740 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -21,12 +21,12 @@
# Date : 26/07/2010
# Purpose : Interactive manipulation of stylization parameters
-from freestyle import Operators
from freestyle.types import (
BinaryPredicate1D,
Interface0DIterator,
Nature,
Noise,
+ Operators,
StrokeAttribute,
UnaryPredicate0D,
UnaryPredicate1D,
diff --git a/release/scripts/freestyle/styles/anisotropic_diffusion.py b/release/scripts/freestyle/styles/anisotropic_diffusion.py
index 95eb279..f241f72 100644
--- a/release/scripts/freestyle/styles/anisotropic_diffusion.py
+++ b/release/scripts/freestyle/styles/anisotropic_diffusion.py
@@ -21,13 +21,12 @@
# Date : 12/08/2004
# Purpose : Smoothes lines using an anisotropic diffusion scheme
-from freestyle import Operators
-from freestyle.types import Stroke
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
ExternalContourUP1D,
NotUP1D,
+ Operators,
QuantitativeInvisibilityUP1D,
TrueBP1D,
TrueUP1D,
@@ -39,6 +38,8 @@ from freestyle.shaders import (
StrokeTextureShader,
pyDiffusion2Shader,
)
+from freestyle.types import Operators, Stroke
+
# pyDiffusion2Shader parameters
offset = 0.25
diff --git a/release/scripts/freestyle/styles/apriori_and_causal_density.py b/release/scripts/freestyle/styles/apriori_and_causal_density.py
index b834cd30..2ba768a 100644
--- a/release/scripts/freestyle/styles/apriori_and_causal_density.py
+++ b/release/scripts/freestyle/styles/apriori_and_causal_density.py
@@ -23,8 +23,6 @@
# subjects them to the causal density so as to avoid
# cluttering
-from freestyle import Operators
-from freestyle.types import IntegrationType
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -38,6 +36,7 @@ from freestyle.shaders import (
ConstantColorShader,
ConstantThicknessShader,
)
+from freestyle.types import IntegrationType, Operators
upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.3, IntegrationType.LAST))
Operators.select(upred)
diff --git a/release/scripts/freestyle/styles/apriori_density.py b/release/scripts/freestyle/styles/apriori_density.py
index a247f5f..22f924d 100644
--- a/release/scripts/freestyle/styles/apriori_density.py
+++ b/release/scripts/freestyle/styles/apriori_density.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Draws lines having a high a priori density
-from freestyle import Operators
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -35,6 +34,8 @@ from freestyle.shaders import (
ConstantColorShader,
ConstantThicknessShader,
)
+from freestyle.types import Operators
+
Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.1,5)))
bpred = TrueBP1D()
diff --git a/release/scripts/freestyle/styles/backbone_stretcher.py b/release/scripts/freestyle/styles/backbone_stretcher.py
index 9ab49b6..3eb921d 100644
--- a/release/scripts/freestyle/styles/backbone_stretcher.py
+++ b/release/scripts/freestyle/styles/backbone_stretcher.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Stretches the geometry of visible lines
-from freestyle import Operators
from freestyle.chainingiterators import ChainSilhouetteIterator
from freestyle.predicates import (
NotUP1D,
@@ -33,6 +32,8 @@ from freestyle.shaders import (
ConstantColorShader,
TextureAssignerShader,
)
+from freestyle.types import Operators
+
Operators.select(QuantitativeInvisibilityUP1D(0))
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
diff --git a/release/scripts/freestyle/styles/blueprint_circles.py b/release/scripts/freestyle/styles/blueprint_circles.py
index 254649d..aade164 100644
--- a/release/scripts/freestyle/styles/blueprint_circles.py
+++ b/release/scripts/freestyle/styles/blueprint_circles.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Produces a blueprint using circular contour strokes
-from freestyle import Operators
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -39,6 +38,8 @@ from freestyle.shaders import (
pyBluePrintCirclesShader,
pyPerlinNoise1DShader,
)
+from freestyle.types import Operators
+
upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
bpred = SameShapeIdBP1D()
diff --git a/release/scripts/freestyle/styles/blueprint_ellipses.py b/release/scripts/freestyle/styles/blueprint_ellipses.py
index d14ff87..d0bd0c4 100644
--- a/release/scripts/freestyle/styles/blueprint_ellipses.py
+++ b/release/scripts/freestyle/styles/blueprint_ellipses.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Produces a blueprint using elliptic contour strokes
-from freestyle import Operators
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -39,6 +38,8 @@ from freestyle.shaders import (
pyBluePrintEllipsesShader,
pyPerlinNoise1DShader,
)
+from freestyle.types import Operators
+
upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
bpred = SameShapeIdBP1D()
diff --git a/release/scripts/freestyle/styles/blueprint_squares.py b/release/scripts/freestyle/styles/blueprint_squares.py
index ba1bdb5..82ab6a8 100644
--- a/release/scripts/freestyle/styles/blueprint_squares.py
+++ b/release/scripts/freestyle/styles/blueprint_squares.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Produces a blueprint using square contour strokes
-from freestyle import Operators
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -39,6 +38,8 @@ from freestyle.shaders import (
pyBluePrintSquaresShader,
pyPerlinNoise1DShader,
)
+from freestyle.types import Operators
+
upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
bpred = SameShapeIdBP1D()
diff --git a/release/scripts/freestyle/styles/cartoon.py b/release/scripts/freestyle/styles/cartoon.py
index 4118b4e..2e2962c 100644
--- a/release/scripts/freestyle/styles/cartoon.py
+++ b/release/scripts/freestyle/styles/cartoon.py
@@ -23,7 +23,6 @@
# infered from each object's material in a cartoon-like
# fashion.
-from freestyle import Operators
from freestyle.chainingiterators import ChainSilhouetteIterator
from freestyle.predicates import (
NotUP1D,
@@ -35,6 +34,8 @@ from freestyle.shaders import (
ConstantThicknessShader,
pyMaterialColorShader,
)
+from freestyle.types import Operators
+
Operators.select(QuantitativeInvisibilityUP1D(0))
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
diff --git a/release/scripts/freestyle/styles/contour.py b/release/scripts/freestyle/styles/contour.py
index 3d754cc..c57d7d0 100644
--- a/release/scripts/freestyle/styles/contour.py
+++ b/release/scripts/freestyle/styles/contour.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Draws each object's visible contour
-from freestyle import Operators
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
AndUP1D,
@@ -35,6 +34,8 @@ from freestyle.shaders import (
ConstantThicknessShader,
IncreasingColorShader,
)
+from freestyle.types import Operators
+
Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D()))
bpred = SameShapeIdBP1D()
diff --git a/release/scripts/freestyle/styles/curvature2d.py b/release/scripts/freestyle/styles/curvature2d.py
index 8f8292e..66c8a6c 100644
--- a/release/scripts/freestyle/styles/curvature2d.py
+++ b/release/scripts/freestyle/styles/curvature2d.py
@@ -22,8 +22,6 @@
# Purpose : The stroke points are colored in gray levels and depending
# on the 2d curvature value
-from freestyle import Operators
-from freestyle.types import Stroke
from freestyle.chainingiterators import ChainSilhouetteIterator
from freestyle.predicates import (
NotUP1D,
@@ -35,6 +33,8 @@ from freestyle.shaders import (
StrokeTextureShader,
py2DCurvatureColorShader,
)
+from freestyle.types import Operators, Stroke
+
Operators.select(QuantitativeInvisibilityUP1D(0))
Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
diff --git a/release/scripts/freestyle/styles/external_contour.py b/release/scripts/freestyle/styles/external_contour.py
index 7556332..4d6c751 100644
--- a/release/scripts/freestyle/styles/external_contour.py
+++ b/release/scripts/freestyle/styles/external_contour.py
@@ -21,7 +21,6 @@
# Date : 04/08/2005
# Purpose : Draws the external co
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list