diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-23 14:19:08 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-23 14:19:08 +0400 |
commit | d1b82d1f15a04a7c2383f0689ceede94971f4b81 (patch) | |
tree | 0c94a3a7fb5c23d144395a75567715a224996c8a /source/blender/freestyle/intern/view_map | |
parent | a9789d90ae7c4408684490844ee9edf37ae84f65 (diff) |
soc-2008-mxcurioni: added Iterator class, base class for all iterators in Freestyle (on the C++ side). Created the equivalent in Python BPy_Iterator with the simple interface:
- getExactTypeName()
- increment()
- decrement()
- isBegin()
- isEnd()
Contrary to previously stated, I am reverting back to implementing iterators in the (Python) API, for different reasons:
- it will make testing quicker to achieve, as I won't have to recode a big chunk of the original Python files
- it will be a base for API refactoring
- it won't prevent the use a list-based approach later (it is simple to get it from the Iterator)
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
3 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index fd2e882e9b6..40027e13d80 100755 --- a/source/blender/freestyle/intern/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h @@ -38,6 +38,9 @@ # include "../geometry/Geom.h" using namespace std; +#include "../system/Iterator.h" //soc + + // // Interface0D // @@ -160,7 +163,7 @@ public: // ////////////////////////////////////////////////// -class Interface0DIteratorNested +class Interface0DIteratorNested : Iterator { public: diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index bb2d916f2df..31abefbfb97 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -32,7 +32,7 @@ # define VIEWMAPADVANCEDITERATORS_H #include "ViewMap.h" - +#include "../system/Iterator.h" //soc /**********************************/ /* */ diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 004674ba758..25da503af66 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h @@ -32,6 +32,8 @@ # define VIEWMAPITERATORS_H #include "ViewMap.h" +#include "../system/Iterator.h" //soc + /**********************************/ /* */ @@ -57,7 +59,7 @@ namespace ViewVertexInternal{ * An instance of an orientedViewEdgeIterator can only * be obtained from a ViewVertex by calling edgesBegin() or edgesEnd(). */ - class orientedViewEdgeIterator + class orientedViewEdgeIterator : Iterator { public: friend class ViewVertex; @@ -204,7 +206,7 @@ namespace ViewVertexInternal{ public: /*! increments.*/ - inline void increment() + virtual inline void increment() { if(_Nature & Nature::T_VERTEX) { @@ -336,11 +338,11 @@ namespace ViewEdgeInternal { _previous_edge = _previous_edge->previousEdge(); } - bool isBegin() const { + virtual bool isBegin() const { return _vertex == _begin; } - bool isEnd() const { + virtual bool isEnd() const { return (!_vertex) || (_vertex == _begin && _previous_edge); } @@ -385,7 +387,7 @@ namespace ViewEdgeInternal { * ::Caution::: the dereferencing operator returns a *pointer* to * the pointed ViewEdge. */ -class ViewEdgeIterator +class ViewEdgeIterator : Iterator { public: |