[Bf-blender-cvs] [54e9016] master: Updated Freestyle API modules according to the new hierarchical package structure.
Tamito Kajiyama
noreply at git.blender.org
Tue Jan 28 15:38:13 CET 2014
Commit: 54e90167704072f0105eb279e7431caa6c4d8e20
Author: Tamito Kajiyama
Date: Sun Nov 24 22:18:38 2013 +0000
https://developer.blender.org/rB54e90167704072f0105eb279e7431caa6c4d8e20
Updated Freestyle API modules according to the new hierarchical package structure.
Additional bug fixes were also done along with the code updates:
* Fix for the use of old Interface1D.pointsBegin() and .pointsEnd() method names
in the definition of pyDensityAnisotropyF1D and pyViewMapGradientNormF1D.
* Fix for wrong data types (int instead of bool) for:
- pyChainSilhouetteGenericIterator constructor and its .orientation property in
modules/freestyle/chainingiterators.py.
- SpatialNoiseShader constructor in styles/external_contour_sketchy.py.
- ChainSilhouetteIterator constructor in styles/multiple_parameterization.py.
===================================================================
M release/scripts/freestyle/modules/freestyle/chainingiterators.py
M release/scripts/freestyle/modules/freestyle/functions.py
M release/scripts/freestyle/modules/freestyle/predicates.py
M release/scripts/freestyle/modules/freestyle/shaders.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/chainingiterators.py b/release/scripts/freestyle/modules/freestyle/chainingiterators.py
index 1e8c192..07ce144 100644
--- a/release/scripts/freestyle/modules/freestyle/chainingiterators.py
+++ b/release/scripts/freestyle/modules/freestyle/chainingiterators.py
@@ -26,6 +26,11 @@ from _freestyle import (
from freestyle.types import (
AdjacencyIterator,
ChainingIterator,
+ Nature,
+ TVertex,
+ )
+from freestyle.predicates import (
+ ExternalContourUP1D,
)
from freestyle.utils import ContextFunctions as CF
import bpy
@@ -283,7 +288,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
self._length = 0
def traverse(self, iter):
winner = None
- winnerOrientation = 0
+ winnerOrientation = False
#print(self.current_edge.id.first, self.current_edge.id.second)
it = AdjacencyIterator(iter)
tvertex = self.next_vertex
@@ -294,9 +299,9 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
if ve.id == mateVE.id:
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
break
it.increment()
else:
@@ -311,9 +316,9 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
count = count+1
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
it.increment()
if count != 1:
winner = None
@@ -328,7 +333,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
# Did we compute the prospective chain length already ?
if self._length == 0:
#if not, let's do it
- _it = pyChainSilhouetteGenericIterator(0,0)
+ _it = pyChainSilhouetteGenericIterator(False, False)
_it.begin = winner
_it.current_edge = winner
_it.orientation = winnerOrientation
@@ -354,7 +359,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
# let's do the comparison:
# nw let's compute the length of this connex non selected part:
connexl = 0
- _cit = pyChainSilhouetteGenericIterator(0,0)
+ _cit = pyChainSilhouetteGenericIterator(False, False)
_cit.begin = winner
_cit.current_edge = winner
_cit.orientation = winnerOrientation
@@ -380,7 +385,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
pass
def traverse(self, iter):
winner = None
- winnerOrientation = 0
+ winnerOrientation = False
#print(self.current_edge.id.first, self.current_edge.id.second)
it = AdjacencyIterator(iter)
tvertex = self.next_vertex
@@ -391,9 +396,9 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
if ve.id == mateVE.id:
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
break
it.increment()
else:
@@ -408,9 +413,9 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
count = count+1
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
it.increment()
if count != 1:
winner = None
@@ -421,7 +426,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
#print("---", winner.id.first, winner.id.second)
# nw let's compute the length of this connex non selected part:
connexl = 0
- _cit = pyChainSilhouetteGenericIterator(0,0)
+ _cit = pyChainSilhouetteGenericIterator(False, False)
_cit.begin = winner
_cit.current_edge = winner
_cit.orientation = winnerOrientation
@@ -453,7 +458,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
self._length = 0
def traverse(self, iter):
winner = None
- winnerOrientation = 0
+ winnerOrientation = False
#print(self.current_edge.id.first, self.current_edge.id.second)
it = AdjacencyIterator(iter)
tvertex = self.next_vertex
@@ -464,9 +469,9 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
if ve.id == mateVE.id:
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
break
it.increment()
else:
@@ -481,9 +486,9 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
count = count+1
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
it.increment()
if count != 1:
winner = None
@@ -498,7 +503,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
# Did we compute the prospective chain length already ?
if self._length == 0:
#if not, let's do it
- _it = pyChainSilhouetteGenericIterator(0,0)
+ _it = pyChainSilhouetteGenericIterator(False, False)
_it.begin = winner
_it.current_edge = winner
_it.orientation = winnerOrientation
@@ -524,7 +529,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
# let's do the comparison:
# nw let's compute the length of this connex non selected part:
connexl = 0
- _cit = pyChainSilhouetteGenericIterator(0,0)
+ _cit = pyChainSilhouetteGenericIterator(False, False)
_cit.begin = winner
_cit.current_edge = winner
_cit.orientation = winnerOrientation
@@ -556,7 +561,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
self._length = 0
def traverse(self, iter):
winner = None
- winnerOrientation = 0
+ winnerOrientation = False
#print(self.current_edge.id.first, self.current_edge.id.second)
it = AdjacencyIterator(iter)
tvertex = self.next_vertex
@@ -567,9 +572,9 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
if ve.id == mateVE.id:
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
break
it.increment()
else:
@@ -584,9 +589,9 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
count = count+1
winner = ve
if not it.is_incoming:
- winnerOrientation = 1
+ winnerOrientation = True
else:
- winnerOrientation = 0
+ winnerOrientation = False
it.increment()
if count != 1:
winner = None
@@ -601,7 +606,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
# Did we compute the prospective chain length already ?
if self._length == 0:
#if not, let's do it
- _it = pyChainSilhouetteGenericIterator(0,0)
+ _it = pyChainSilhouetteGenericIterator(False, False)
_it.begin = winner
_it.current_edge = winner
_it.orientation = winnerOrientation
@@ -627,7 +632,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
# let's do the comparison:
# nw let's compute the length of this connex non selected part:
connexl = 0
- _cit = pyChainSilhouetteGenericIterator(0,0)
+ _cit = pyChainSilhouetteGenericIterator(False, False)
_cit.begin = winner
_cit.current_edge = winner
_cit.orientation = winnerOrientation
diff --git a/release/scripts/fre
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list