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

Freestyle Python API improvements - part 4.

Browse Source 
Major API updates were made as in part 3 to address code review comments.
This revision focuses on Python wrappers of C++ iterators.

* Most getter/setter methods were reimplemented as attributes using PyGetSetDef.

* The naming of methods and attributes was fixed to follow the naming conventions
of the Blender Python API (i.e., lower case + underscores for methods and attributes,
and CamelCase for classes).  The only irregular naming change is the following, to
better indicate the functionality:

- ChainingIterator: getVertex --> next_vertex

* In addition, some code clean-up was done in both C++ and Python.  Also duplicated
definitions of predicate classes were removed.
This commit is contained in:
Tamito Kajiyama
2013-02-16 14:21:40 +00:00
parent aa9c01f384
commit b35a893249
17 changed files with 1001 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ class pyHigherNumberOfTurnsUP1D(UnaryPredicate1D):
count = 0
func = Curvature2DAngleF0D()
it = inter.vertices_begin()
while not it.isEnd():
while not it.is_end:
if func(it) > self._a:
count = count+1
if count > self._n:
@@ -198,14 +198,14 @@ class pyIsOccludedByUP1D(UnaryPredicate1D):
it = inter.vertices_begin()
itlast = inter.vertices_end()
itlast.decrement()
v = it.getObject()
vlast = itlast.getObject()
v = it.object
vlast = itlast.object
tvertex = v.viewvertex
if type(tvertex) is TVertex:
print("TVertex: [ ", tvertex.id.first, ",", tvertex.id.second," ]")
eit = tvertex.edges_begin()
while not eit.isEnd():
ve, incoming = eit.getObject()
while not eit.is_end:
ve, incoming = eit.object
if ve.id == self._id:
return 1
print("-------", ve.id.first, "-", ve.id.second)
@@ -214,8 +214,8 @@ class pyIsOccludedByUP1D(UnaryPredicate1D):
if type(tvertex) is TVertex:
print("TVertex: [ ", tvertex.id.first, ",", tvertex.id.second," ]")
eit = tvertex.edges_begin()
while not eit.isEnd():
ve, incoming = eit.getObject()
while not eit.is_end:
ve, incoming = eit.object
if ve.id == self._id:
return 1
print("-------", ve.id.first, "-", ve.id.second)
@@ -349,8 +349,8 @@ class pyClosedCurveUP1D(UnaryPredicate1D):
it = inter.vertices_begin()
itlast = inter.vertices_end()
itlast.decrement()
vlast = itlast.getObject()
v = it.getObject()
vlast = itlast.object
v = it.object
print(v.id.first, v.id.second)
print(vlast.id.first, vlast.id.second)
if v.id == vlast.id: