diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-24 12:29:48 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-24 12:29:48 +0400 |
commit | a0359c37506d05589bae86e4818fa653c8f281ab (patch) | |
tree | 35927f22801fa65585ac6f076abb29406189dd2a /source/blender/freestyle/intern/view_map | |
parent | dd899939dabae68564f7a1d1994b50ee2f2cf8be (diff) |
soc-2008-mxcurioni: added (without testing) the following classes: BBox, SShape, ViewShape. Also corrected a few typos (Get#->get#).
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
7 files changed, 34 insertions, 32 deletions
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 54a982b8bd8..d7086e4baff 100755 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -112,7 +112,7 @@ void FEdgeXDetector::preProcessShape(WXShape* iWShape) { preProcessFace((WXFace*)(*f)); } - vector<WVertex*>& wvertices = iWShape->GetVertexList(); + vector<WVertex*>& wvertices = iWShape->getVertexList(); for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end(); wv!=wvend; ++wv){ @@ -219,7 +219,7 @@ void FEdgeXDetector::processSilhouetteShape(WXShape* iWShape) { // the silhouette edges that are not smooth // -------------------- vector<WEdge*>::iterator we, weend; - vector<WEdge*> &wedges = iWShape->GetEdgeList(); + vector<WEdge*> &wedges = iWShape->getEdgeList(); for(we=wedges.begin(), weend=wedges.end(); we!=weend; ++we) @@ -298,7 +298,7 @@ void FEdgeXDetector::processBorderShape(WXShape* iWShape) { // the BORDER // -------------------- vector<WEdge*>::iterator we, weend; - vector<WEdge*> &wedges = iWShape->GetEdgeList(); + vector<WEdge*> &wedges = iWShape->getEdgeList(); for(we=wedges.begin(), weend=wedges.end(); we!=weend; ++we){ @@ -328,7 +328,7 @@ void FEdgeXDetector::processCreaseShape(WXShape* iWShape) { // the CREASE // -------------------- vector<WEdge*>::iterator we, weend; - vector<WEdge*> &wedges = iWShape->GetEdgeList(); + vector<WEdge*> &wedges = iWShape->getEdgeList(); for(we=wedges.begin(), weend=wedges.end(); we!=weend; ++we){ diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index 40027e13d80..eaa6d31829b 100755 --- a/source/blender/freestyle/intern/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h @@ -163,7 +163,7 @@ public: // ////////////////////////////////////////////////// -class Interface0DIteratorNested : Iterator +class Interface0DIteratorNested : public Iterator { public: @@ -215,7 +215,7 @@ public: * where \a it1 and \a it2 are 2 Interface0DIterator. * Otherwise, incrementing \a it1 will also increment \a it2. */ -class Interface0DIterator +class Interface0DIterator : public Iterator { public: @@ -248,7 +248,7 @@ public: } /*! Returns the string "Interface0DIterator". */ - string getExactTypeName() const { + virtual string getExactTypeName() const { if (!_iterator) return "Interface0DIterator"; return _iterator->getExactTypeName() + "Proxy"; @@ -306,12 +306,12 @@ public: } /*! Increments. */ - void increment() { + virtual void increment() { _iterator->increment(); } /*! Decrements. */ - void decrement() { + virtual void decrement() { _iterator->decrement(); } @@ -319,14 +319,14 @@ public: * first of the 1D element containing the points over * which we're iterating. */ - bool isBegin() const { + virtual bool isBegin() const { return _iterator->isBegin(); } /*! Returns true if the pointed Interface0D is after the * after the last point of the 1D element we're iterating from. */ - bool isEnd() const { + virtual bool isEnd() const { return _iterator->isEnd(); } diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index c88a3da8967..14d934c6791 100755 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -963,7 +963,7 @@ public: // vertices //--------- vector<SVertex*>::iterator sv,svend; - vector<SVertex*>& verticesList = iBrother.GetVertexList(); + vector<SVertex*>& verticesList = iBrother.getVertexList(); for(sv=verticesList.begin(), svend=verticesList.end(); sv!=svend; sv++) @@ -977,7 +977,7 @@ public: // edges //------ vector<FEdge*>::iterator e,eend; - vector<FEdge*>& edgesList = iBrother.GetEdgeList(); + vector<FEdge*>& edgesList = iBrother.getEdgeList(); for(e=edgesList.begin(),eend=edgesList.end(); e!=eend; e++) @@ -990,7 +990,7 @@ public: // starting chain edges //------------------------- vector<FEdge*>::iterator fe,fend; - vector<FEdge*>& fedges = iBrother.GetChains(); + vector<FEdge*>& fedges = iBrother.getChains(); for(fe=fedges.begin(),fend=fedges.end(); fe!=fend; fe++) @@ -1392,10 +1392,10 @@ public: /* accessors */ /*! Returns the list of SVertex of the Shape. */ - inline vector<SVertex*>& GetVertexList() {return _verticesList;} // Get vertices list + inline vector<SVertex*>& getVertexList() {return _verticesList;} // Get vertices list /*! Returns the list of FEdges of the Shape. */ - inline vector<FEdge*>& GetEdgeList() {return _edgesList;} // Get edges list - inline vector<FEdge*>& GetChains() {return _chains;} + inline vector<FEdge*>& getEdgeList() {return _edgesList;} // Get edges list + inline vector<FEdge*>& getChains() {return _chains;} /*! Returns the bounding box of the shape. */ inline const BBox<Vec3r>& bbox() {return _BBox;} /*! Returns the ith material of the shape. */ diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index 3feeb6664df..42c39d5795e 100755 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -87,7 +87,7 @@ void ViewEdgeXBuilder::BuildViewEdges( WXShape *iWShape, ViewShape *oVShape, //iWShape->ResetUserData(); WXEdge * wxe; - vector<WEdge*>& wedges = iWShape->GetEdgeList(); + vector<WEdge*>& wedges = iWShape->getEdgeList(); // //------------------------------ for(vector<WEdge*>::iterator we=wedges.begin(),weend=wedges.end(); @@ -111,8 +111,8 @@ void ViewEdgeXBuilder::BuildViewEdges( WXShape *iWShape, ViewShape *oVShape, // Add all these new edges to the scene's feature edges list: //----------------------------------------------------------- - vector<FEdge*>& newedges = _pCurrentSShape->GetEdgeList(); - vector<SVertex*>& newVertices = _pCurrentSShape->GetVertexList(); + vector<FEdge*>& newedges = _pCurrentSShape->getEdgeList(); + vector<SVertex*>& newVertices = _pCurrentSShape->getVertexList(); vector<ViewVertex*>& newVVertices = _pCurrentVShape->vertices(); vector<ViewEdge*>& newVEdges = _pCurrentVShape->edges(); diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 2691da20057..2ddeb198fff 100755 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -862,7 +862,9 @@ public: _splittingId = 0; UpdateFEdges(); // tells every FEdge between iFEdgeA and iFEdgeB that this is theit ViewEdge } -protected: + +//soc protected: + /*! Copy constructor. */ inline ViewEdge(ViewEdge& iBrother) { diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index 370f44dffcf..3591c67ce1f 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp @@ -628,24 +628,24 @@ namespace ViewMapIO { save(out, vs->sshape()->material(i)); // -> VerticesList (List) - tmp = vs->sshape()->GetVertexList().size(); + tmp = vs->sshape()->getVertexList().size(); WRITE(tmp); - for (vector<SVertex*>::const_iterator i1 = vs->sshape()->GetVertexList().begin(); - i1 != vs->sshape()->GetVertexList().end(); i1++) + for (vector<SVertex*>::const_iterator i1 = vs->sshape()->getVertexList().begin(); + i1 != vs->sshape()->getVertexList().end(); i1++) WRITE_IF_NON_NULL(*i1); // -> Chains (List) - tmp = vs->sshape()->GetChains().size(); + tmp = vs->sshape()->getChains().size(); WRITE(tmp); - for (vector<FEdge*>::const_iterator i2 = vs->sshape()->GetChains().begin(); - i2 != vs->sshape()->GetChains().end(); i2++) + for (vector<FEdge*>::const_iterator i2 = vs->sshape()->getChains().begin(); + i2 != vs->sshape()->getChains().end(); i2++) WRITE_IF_NON_NULL(*i2); // -> EdgesList (List) - tmp = vs->sshape()->GetEdgeList().size(); + tmp = vs->sshape()->getEdgeList().size(); WRITE(tmp); - for (vector<FEdge*>::const_iterator i3 = vs->sshape()->GetEdgeList().begin(); - i3 != vs->sshape()->GetEdgeList().end(); i3++) + for (vector<FEdge*>::const_iterator i3 = vs->sshape()->getEdgeList().begin(); + i3 != vs->sshape()->getEdgeList().end(); i3++) WRITE_IF_NON_NULL(*i3); // ViewEdges (List) diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 25da503af66..fa6fb8e1641 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h @@ -59,7 +59,7 @@ namespace ViewVertexInternal{ * An instance of an orientedViewEdgeIterator can only * be obtained from a ViewVertex by calling edgesBegin() or edgesEnd(). */ - class orientedViewEdgeIterator : Iterator + class orientedViewEdgeIterator : public Iterator { public: friend class ViewVertex; @@ -387,7 +387,7 @@ namespace ViewEdgeInternal { * ::Caution::: the dereferencing operator returns a *pointer* to * the pointed ViewEdge. */ -class ViewEdgeIterator : Iterator +class ViewEdgeIterator : public Iterator { public: |