diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-17 10:35:30 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-17 10:35:30 +0400 |
commit | e4748940c0a61171d5c4e45d8d5a9637d05ac429 (patch) | |
tree | 12485e1e989e7e1f766c370f92d379ef565599c5 /source/blender/freestyle/intern/view_map/ViewMap.h | |
parent | cc1a6b398da9bd2cec78c4242c5b205f079aa4a6 (diff) |
soc-2008-mxcurioni: SWIG removal - completed SVertex and CurvePoint classes migration. Stabilized a lot of the code for C++ -> Python conversion. Added the correct rich comparison operator and tested it. Corrected 'dupplicate' typo and changde to __copy__ for Python API.
From now on, when a set should be output (PySet_Type), it is given as a list (PyList_Type). The reason is that it doesn't really matter what we bring back to the Python interpreter. The set is guaranteed in memory on the C++ side.
For the CurvePoint class, the userdata variable is not yet ported (and will probably available as a list or a dictionary). The CurvePoint implementation works except for the initialization from other CurvePoints: somehow, the inner variables don't seem to be correctly handled. I do not know if it is a bug in Freestyle or if the CurvePoint object's state is correct for my test case. CurvePoint needs more testing.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMap.h')
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMap.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index bdbb140e130..7528d27cac6 100755 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -254,7 +254,7 @@ protected: userdata = 0; } /*! Cloning method. */ - virtual ViewVertex * dupplicate() = 0; + virtual ViewVertex * duplicate() = 0; public: /*! Destructor. */ @@ -443,7 +443,7 @@ protected: } /*! Cloning method. */ - virtual ViewVertex * dupplicate() + virtual ViewVertex * duplicate() { TVertex *clone = new TVertex(*this); return clone; @@ -650,7 +650,7 @@ protected: _ViewEdges = iBrother._ViewEdges; } /*! Cloning method. */ - virtual ViewVertex * dupplicate() + virtual ViewVertex * duplicate() { NonTVertex *clone = new NonTVertex(*this); return clone; @@ -878,7 +878,7 @@ protected: userdata = 0; } /*! Cloning method. */ - virtual ViewEdge * dupplicate() + virtual ViewEdge * duplicate() { ViewEdge *clone = new ViewEdge(*this); return clone; @@ -1107,22 +1107,22 @@ public: _SShape = iBrother._SShape; vector<ViewVertex*>& vvertices = iBrother.vertices(); - // dupplicate vertices + // duplicate vertices for(vv=vvertices.begin(), vvend=vvertices.end(); vv!=vvend; vv++) { - ViewVertex * newVertex = (*vv)->dupplicate(); + ViewVertex * newVertex = (*vv)->duplicate(); AddVertex(newVertex); } vector<ViewEdge*>& vvedges = iBrother.edges(); - // dupplicate edges + // duplicate edges for(ve=vvedges.begin(), veend=vvedges.end(); ve!=veend; ve++) { - ViewEdge * newEdge = (*ve)->dupplicate(); + ViewEdge * newEdge = (*ve)->duplicate(); AddEdge(newEdge); // here the shape is set as the edge's shape } @@ -1209,7 +1209,7 @@ public: } /*! Cloning method. */ - virtual ViewShape * dupplicate() + virtual ViewShape * duplicate() { ViewShape *clone = new ViewShape(*this); return clone; |