diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-01 02:13:48 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-01 02:13:48 +0400 |
commit | ba9943e4a7a6c671e427c08fc11845168a30e86a (patch) | |
tree | 99310397139b528b4ba46012389aea490597a78f /source/blender/freestyle/intern/python/Interface1D | |
parent | 6134a41270ab7629bb6e09de5462ba386861ede3 (diff) |
* Implemented Python's iterator protocol in Interface0DIterator and
orientedViewEdgeIterator.
* Simplified Python-related error handling in C++ class definitions.
The definitions of the following C++ methods were simplified and most
code segments using the C/Python API were moved to Director.cpp.
ChainingIterator::init()
ChainingIterator::traverse()
UnaryPredicate0D::operator()()
UnaryPredicate1D::operator()()
BinaryPredicate0D::operator()()
BinaryPredicate1D::operator()()
UnaryFunction0D::operator()()
UnaryFunction1D::operator()()
StrokeShader.shade()
* Moved part of the introspection-based automatic type conversion code
from BPy_Interface0DIterator.cpp and Director.cpp to BPy_Convert.cpp
for the sake of better code organization.
* Fixed an uninitialized member in StrokeVertexIterator___init__().
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D')
4 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index 84529321f29..4e646de18e6 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -341,12 +341,12 @@ PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) { PyObject * FEdge_verticesBegin( BPy_FEdge *self ) { Interface0DIterator if0D_it( self->fe->verticesBegin() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FEdge_verticesEnd( BPy_FEdge *self ) { Interface0DIterator if0D_it( self->fe->verticesEnd() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } @@ -357,7 +357,7 @@ PyObject * FEdge_pointsBegin( BPy_FEdge *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->fe->pointsBegin(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args ) { @@ -367,7 +367,7 @@ PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->fe->pointsEnd(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 541391e05a7..a44e2feed5b 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -204,12 +204,12 @@ PyObject * FrsCurve_nSegments( BPy_FrsCurve *self ) { PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self ) { Interface0DIterator if0D_it( self->c->verticesBegin() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self ) { Interface0DIterator if0D_it( self->c->verticesEnd() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } @@ -220,7 +220,7 @@ PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->c->pointsBegin(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) { @@ -230,7 +230,7 @@ PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->c->pointsEnd(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 722e1d376ae..89b9478212f 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -383,12 +383,12 @@ PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) { PyObject * Stroke_verticesBegin( BPy_Stroke *self ) { Interface0DIterator if0D_it( self->s->verticesBegin() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * Stroke_verticesEnd( BPy_Stroke *self ) { Interface0DIterator if0D_it( self->s->verticesEnd() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args) { @@ -398,7 +398,7 @@ PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args) { return NULL; Interface0DIterator if0D_it( self->s->pointsBegin(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args) { @@ -408,7 +408,7 @@ PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args) { return NULL; Interface0DIterator if0D_it( self->s->pointsEnd(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 28280a0723f..958d96031e3 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -345,12 +345,12 @@ PyObject * ViewEdge_setQI( BPy_ViewEdge *self, PyObject *args ) { PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self ) { Interface0DIterator if0D_it( self->ve->verticesBegin() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self ) { Interface0DIterator if0D_it( self->ve->verticesEnd() ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } @@ -361,7 +361,7 @@ PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->ve->pointsBegin(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 ); } PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ) { @@ -371,7 +371,7 @@ PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ) { return NULL; Interface0DIterator if0D_it( self->ve->pointsEnd(f) ); - return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); + return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 ); } PyObject * ViewEdge_qi( BPy_ViewEdge *self ) { |