Added StrokeAttribute class. Beginning of StrokeVertex.

IMPORTANT: The setters functions' names were normalized due to constant confusion regarding capitalization. All the function names start with set... instead of Set.... This convention was changed all throughout Freestyle. To use Freestyle as an external renderer, the SWIG library MUST be regenerated.

6 files changed, 100 insertions, 100 deletions

diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 3f27bf6a8a0..0d02e0ca131 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -292,10 +292,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
       // Adds the edge to the face
       //AddEdge((*it1)->GetaOEdge());
       AddEdge(woea);
-      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
       //sets these vertices as border:
-      v1->SetBorder(true);
-      v2->SetBorder(true);
+      v1->setBorder(true);
+      v2->setBorder(true);
       //return (*it1)->GetaOEdge();
       return woea;
     }
@@ -311,10 +311,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
       // Adds the edge to the face
       //AddEdge((*it1)->GetaOEdge());
       AddEdge(woeb);
-      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
       //sets these vertices as border:
-      v1->SetBorder(true);
-      v2->SetBorder(true);
+      v1->setBorder(true);
+      v2->setBorder(true);
       //return (*it1)->GetaOEdge();
       return woeb;
     }
@@ -352,10 +352,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
     edge = pInvertEdge->GetOwner(); 
     
     // Sets the a Face (retrieved from pInvertEdge
-    pOEdge->SetaFace(pInvertEdge->GetbFace());
+    pOEdge->setaFace(pInvertEdge->GetbFace());
     
     // Updates the invert edge:
-    pInvertEdge->SetaFace(this);
+    pInvertEdge->setaFace(this);
   }
   else // The invert edge does not exist yet
   {
@@ -369,20 +369,20 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
 
   }
 
-  pOEdge->SetOwner(edge);
+  pOEdge->setOwner(edge);
   // Add the vertices:
-  pOEdge->SetaVertex(v1);
-  pOEdge->SetbVertex(v2);
+  pOEdge->setaVertex(v1);
+  pOEdge->setbVertex(v2);
 
   // Debug:
   if(v1->GetId() == v2->GetId())
     cerr << "Warning: edge " << this << " null with vertex " << v1->GetId() << endl;
 
   edge->AddOEdge(pOEdge);
-  //edge->SetNumberOfOEdges(edge->GetNumberOfOEdges()+1);
+  //edge->setNumberOfOEdges(edge->GetNumberOfOEdges()+1);
 
   // Add this face (the b face)
-  pOEdge->SetbFace(this);
+  pOEdge->setbFace(this);
 
   // Adds the edge to the face
   AddEdge(pOEdge);
@@ -487,7 +487,7 @@ WShape::WShape(WShape& iBrother)
     //WVertex *newVertex = new WVertex(*(*v));
     WVertex *newVertex = (*v)->duplicate();
 
-    newVertex->SetShape(this);
+    newVertex->setShape(this);
     AddVertex(newVertex);
   }
 
@@ -528,7 +528,7 @@ WShape::WShape(WShape& iBrother)
       edgedata * currentvedata = (edgedata*)current->userdata;
       newvedgelist.push_back(currentvedata->_copy);
     }
-    (*v)->SetEdges(newvedgelist);
+    (*v)->setEdges(newvedgelist);
   }
 
   eend = _EdgeList.end();
@@ -538,23 +538,23 @@ WShape::WShape(WShape& iBrother)
   {
     // update aOedge:
     WOEdge *aoEdge = (*e)->GetaOEdge();
-    aoEdge->SetaVertex(((vertexdata*)(aoEdge->GetaVertex()->userdata))->_copy);
-    aoEdge->SetbVertex(((vertexdata*)(aoEdge->GetbVertex()->userdata))->_copy);
+    aoEdge->setaVertex(((vertexdata*)(aoEdge->GetaVertex()->userdata))->_copy);
+    aoEdge->setbVertex(((vertexdata*)(aoEdge->GetbVertex()->userdata))->_copy);
     if(NULL != aoEdge->GetaFace())
-      aoEdge->SetaFace(((facedata*)(aoEdge->GetaFace()->userdata))->_copy);
-    aoEdge->SetbFace(((facedata*)(aoEdge->GetbFace()->userdata))->_copy);
-    aoEdge->SetOwner(((edgedata*)(aoEdge->GetOwner()->userdata))->_copy);
+      aoEdge->setaFace(((facedata*)(aoEdge->GetaFace()->userdata))->_copy);
+    aoEdge->setbFace(((facedata*)(aoEdge->GetbFace()->userdata))->_copy);
+    aoEdge->setOwner(((edgedata*)(aoEdge->GetOwner()->userdata))->_copy);
     // update bOedge:
 
     WOEdge *boEdge = (*e)->GetbOEdge();
     if(boEdge != 0)
     {
-      boEdge->SetaVertex(((vertexdata*)(boEdge->GetaVertex()->userdata))->_copy);
-      boEdge->SetbVertex(((vertexdata*)(boEdge->GetbVertex()->userdata))->_copy);
+      boEdge->setaVertex(((vertexdata*)(boEdge->GetaVertex()->userdata))->_copy);
+      boEdge->setbVertex(((vertexdata*)(boEdge->GetbVertex()->userdata))->_copy);
       if(NULL != boEdge->GetaFace())
-        boEdge->SetaFace(((facedata*)(boEdge->GetaFace()->userdata))->_copy);
-      boEdge->SetbFace(((facedata*)(boEdge->GetbFace()->userdata))->_copy);
-      boEdge->SetOwner(((edgedata*)(boEdge->GetOwner()->userdata))->_copy);
+        boEdge->setaFace(((facedata*)(boEdge->GetaFace()->userdata))->_copy);
+      boEdge->setbFace(((facedata*)(boEdge->GetbFace()->userdata))->_copy);
+      boEdge->setOwner(((edgedata*)(boEdge->GetOwner()->userdata))->_copy);
     }
   }
 
@@ -576,7 +576,7 @@ WShape::WShape(WShape& iBrother)
       //oedgeList[i] = currentoedata->_copy;
       //oedgeList[i] = ((oedgedata*)(oedgeList[i]->userdata))->_copy;
     }
-    (*f)->SetEdgeList(newoedgelist);
+    (*f)->setEdgeList(newoedgelist);
   }
 
   // Free all memory (arghh!)
@@ -638,9 +638,9 @@ WFace * WShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsL
     return 0;
 
   // set the list of per-vertex normals
-  face->SetNormalList(iNormalsList);
+  face->setNormalList(iNormalsList);
   // set the list of per-vertex tex coords
-  face->SetTexCoordsList(iTexCoordsList);
+  face->setTexCoordsList(iTexCoordsList);
 
   return face;
 }
@@ -650,7 +650,7 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
 
   int id = _FaceList.size();
 
-  face->SetMaterialIndex(iMaterial);
+  face->setMaterialIndex(iMaterial);
 
   // Check whether we have a degenerated face:
 
@@ -701,7 +701,7 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
     {
       // means that we just created a new edge and that we must add it to the 
       // shape's edges list
-      edge->SetId(_EdgeList.size());
+      edge->setId(_EdgeList.size());
       AddEdge(edge);
       // compute the mean edge value:
       _meanEdgeSize += edge->GetaOEdge()->getVec3r().norm();
@@ -722,10 +722,10 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
 
   Vec3r normal(vector1 ^ vector2);
   normal.normalize();
-  face->SetNormal(normal);
+  face->setNormal(normal);
 
   // Add the face to the shape's faces list:
-  face->SetId(id);
+  face->setId(id);
   AddFace(face);
 
   return face;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index b4c6a38f5bd..99dc83faf96 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -80,12 +80,12 @@ public:
   bool isBoundary();
   
   /*! modifiers */
-  inline void SetVertex(const Vec3r& v) {_Vertex = v;}
-  inline void SetEdges(const vector<WEdge *>& iEdgeList) {_EdgeList = iEdgeList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetShape(WShape *iShape) {_Shape = iShape;}
-  inline void SetSmooth(bool b) {_Smooth = b;}
-  inline void SetBorder(bool b) {if(b) _Border= 1; else _Border = 0;}
+  inline void setVertex(const Vec3r& v) {_Vertex = v;}
+  inline void setEdges(const vector<WEdge *>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setShape(WShape *iShape) {_Shape = iShape;}
+  inline void setSmooth(bool b) {_Smooth = b;}
+  inline void setBorder(bool b) {if(b) _Border= 1; else _Border = 0;}
   
   /*! Adds an edge to the edges list */
   void AddEdge(WEdge *iEdge) ;
@@ -333,11 +333,11 @@ public:
   //  inline void SetbCWEdge(WOEdge *pe) {_pbCWEdge = pe;}
   //  inline void SetaCCWEdge(WOEdge *pe) {_paCCWEdge = pe;}
   //  inline void SetbCCCWEdge(WOEdge *pe) {_pbCCWEdge = pe;}
-  inline void SetaVertex(WVertex *pv) {_paVertex = pv;}
-  inline void SetbVertex(WVertex *pv) {_pbVertex = pv;}
-  inline void SetaFace(WFace *pf) {_paFace = pf;}
-  inline void SetbFace(WFace *pf) {_pbFace = pf;}
-  inline void SetOwner(WEdge *pe) {_pOwner = pe;}
+  inline void setaVertex(WVertex *pv) {_paVertex = pv;}
+  inline void setbVertex(WVertex *pv) {_pbVertex = pv;}
+  inline void setaFace(WFace *pf) {_paFace = pf;}
+  inline void setbFace(WFace *pf) {_pbFace = pf;}
+  inline void setOwner(WEdge *pe) {_pOwner = pe;}
 
   /*! Retrieves the list of edges in CW order */
   inline void RetrieveCWOrderedEdges(vector<WEdge*>& oEdges);
@@ -453,8 +453,8 @@ public:
   }
 
   /*! modifiers */
-  inline void SetaOEdge(WOEdge *iEdge) {_paOEdge = iEdge;}
-  inline void SetbOEdge(WOEdge *iEdge) {_pbOEdge = iEdge;}
+  inline void setaOEdge(WOEdge *iEdge) {_paOEdge = iEdge;}
+  inline void setbOEdge(WOEdge *iEdge) {_pbOEdge = iEdge;}
   inline void AddOEdge(WOEdge *iEdge) 
   {
     if(NULL == _paOEdge)
@@ -470,8 +470,8 @@ public:
       return;
     }
   }
-  inline void SetNumberOfOEdges(int n) {_nOEdges = n;}
-  inline void SetId(int id) {_Id = id;}
+  inline void setNumberOfOEdges(int n) {_nOEdges = n;}
+  inline void setId(int id) {_Id = id;}
   virtual void ResetUserData() {userdata = 0;}
 };
 
@@ -648,12 +648,12 @@ public:
     return false;
   }
   /*! modifiers */
-  inline void SetEdgeList(const vector<WOEdge*>& iEdgeList) {_OEdgeList = iEdgeList;}
-  inline void SetNormal(const Vec3r& iNormal) {_Normal = iNormal;}
-  inline void SetNormalList(const vector<Vec3r>& iNormalsList) {_VerticesNormals = iNormalsList;}
-  inline void SetTexCoordsList(const vector<Vec2r>& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;}
+  inline void setEdgeList(const vector<WOEdge*>& iEdgeList) {_OEdgeList = iEdgeList;}
+  inline void setNormal(const Vec3r& iNormal) {_Normal = iNormal;}
+  inline void setNormalList(const vector<Vec3r>& iNormalsList) {_VerticesNormals = iNormalsList;}
+  inline void setTexCoordsList(const vector<Vec2r>& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;}
 
   /*! designed to build a specialized WEdge 
    *  for use in MakeEdge
@@ -753,14 +753,14 @@ public:
   inline const vector<Material>& materials() const {return _Materials;}
   inline const real getMeanEdgeSize() const {return _meanEdgeSize;}
   /*! modifiers */
-  static inline void SetCurrentId(const unsigned id) { _SceneCurrentId = id; }
-  inline void SetEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
-  inline void SetVertexList(const vector<WVertex*>& iVertexList) {_VertexList = iVertexList;}
-  inline void SetFaceList(const vector<WFace*>& iFaceList) {_FaceList = iFaceList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
-  inline void SetMaterial(const Material& material, unsigned i) {_Materials[i]=material;}
-  inline void SetMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
+  static inline void setCurrentId(const unsigned id) { _SceneCurrentId = id; }
+  inline void setEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void setVertexList(const vector<WVertex*>& iVertexList) {_VertexList = iVertexList;}
+  inline void setFaceList(const vector<WFace*>& iFaceList) {_FaceList = iFaceList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
+  inline void setMaterial(const Material& material, unsigned i) {_Materials[i]=material;}
+  inline void setMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
 
   /*! designed to build a specialized WFace 
    *  for use in MakeFace
@@ -806,7 +806,7 @@ public:
 
   inline void AddEdge(WEdge *iEdge) {_EdgeList.push_back(iEdge);}
   inline void AddFace(WFace* iFace) {_FaceList.push_back(iFace);}
-  inline void AddVertex(WVertex *iVertex) {iVertex->SetShape(this); _VertexList.push_back(iVertex);}
+  inline void AddVertex(WVertex *iVertex) {iVertex->setShape(this); _VertexList.push_back(iVertex);}
 
   inline void ResetUserData()
   {
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
index 115a4f61789..ff567aee06a 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
@@ -162,16 +162,16 @@ WXSmoothEdge* WXFaceLayer::BuildSmoothEdge(){
   }
   if(ok){
     _pSmoothEdge = new WXSmoothEdge;
-    _pSmoothEdge->SetWOeA(woea);
-    _pSmoothEdge->SetWOeB(woeb);
-    _pSmoothEdge->SetTa(ta);
-    _pSmoothEdge->SetTb(tb);
+    _pSmoothEdge->setWOeA(woea);
+    _pSmoothEdge->setWOeB(woeb);
+    _pSmoothEdge->setTa(ta);
+    _pSmoothEdge->setTb(tb);
     if(_Nature & Nature::SILHOUETTE){
       if(_nNullDotP != 2){
         if(_DotP[_ClosestPointIndex] + 0.01 > 0)
-          _pSmoothEdge->SetFront(true);
+          _pSmoothEdge->setFront(true);
         else
-          _pSmoothEdge->SetFront(false); 
+          _pSmoothEdge->setFront(false); 
       }
     }
   }
@@ -221,10 +221,10 @@ WXSmoothEdge* WXFaceLayer::BuildSmoothEdge(){
   //          } 
   //      
   //        _pSmoothEdge = new ExactSilhouetteEdge(ExactSilhouetteEdge::VERTEX_VERTEX);
-  //        _pSmoothEdge->SetWOeA(woea);
-  //        _pSmoothEdge->SetWOeA(woeb);
-  //        _pSmoothEdge->SetTa(ta);
-  //        _pSmoothEdge->SetTb(tb);
+  //        _pSmoothEdge->setWOeA(woea);
+  //        _pSmoothEdge->setWOeA(woeb);
+  //        _pSmoothEdge->setTa(ta);
+  //        _pSmoothEdge->setTb(tb);
   //
   //        return _pSmoothEdge;
   //        }
@@ -246,7 +246,7 @@ void WXFace::ComputeCenter()
     center += (*wv)->GetVertex();
   }
   center /= (real)iVertexList.size();
-  SetCenter(center);
+  setCenter(center);
 }
 
                   /**********************************/
@@ -272,7 +272,7 @@ WFace* WXShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex)
     center += (*wv)->GetVertex();
   }
   center /= (real)iVertexList.size();
-  ((WXFace*)face)->SetCenter(center);
+  ((WXFace*)face)->setCenter(center);
 
   return face;
 }
@@ -289,7 +289,7 @@ WFace * WXShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormals
   //    center += (*wv)->GetVertex();
   //  }
   //  center /= (real)iVertexList.size();
-  //  ((WSFace*)face)->SetCenter(center);
+  //  ((WSFace*)face)->setCenter(center);
 
   return face;
 }
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 8c53bb8390e..0518e70d90b 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -129,10 +129,10 @@ public:
   inline int order() const {return _order;}
   
   /*! modifiers */
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetNature(WXNature iNature) {_nature = iNature;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setNature(WXNature iNature) {_nature = iNature;}
   inline void AddNature(WXNature iNature) {_nature = _nature|iNature;}
-  inline void SetOrder(int i) {_order = i;}
+  inline void setOrder(int i) {_order = i;}
   
 };
 
@@ -186,12 +186,12 @@ public:
   inline Configuration configuration() const {return _config;} 
   
   /*! modifiers */
-  inline void SetWOeA(WOEdge *iwoea) {_woea = iwoea;}
-  inline void SetWOeB(WOEdge *iwoeb) {_woeb = iwoeb;}
-  inline void SetTa(real ta) {_ta = ta;}
-  inline void SetTb(real tb) {_tb = tb;}
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetConfiguration(Configuration iConf) {_config = iConf;}
+  inline void setWOeA(WOEdge *iwoea) {_woea = iwoea;}
+  inline void setWOeB(WOEdge *iwoeb) {_woeb = iwoeb;}
+  inline void setTa(real ta) {_ta = ta;}
+  inline void setTb(real tb) {_tb = tb;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setConfiguration(Configuration iConf) {_config = iConf;}
   
 };
 /* Class to store a value per vertex and a smooth edge. 
@@ -256,7 +256,7 @@ public:
   inline WXFace * getFace() {return _pWXFace;}
   inline WXSmoothEdge * getSmoothEdge() {return _pSmoothEdge;}
   inline bool isViewDependant() const {return _viewDependant;}
-  inline void SetClosestPointIndex(int iIndex) {_ClosestPointIndex = iIndex;}
+  inline void setClosestPointIndex(int iIndex) {_ClosestPointIndex = iIndex;}
 
   inline void removeSmoothEdge() {
     if(!_DotP.empty())
@@ -283,7 +283,7 @@ public:
    */
   void RetrieveCuspEdgesIndices(vector<int>& oCuspEdges);
   WXSmoothEdge * BuildSmoothEdge();
-  inline void SetDotP(const vector<real>& iDotP) {_DotP = iDotP;}
+  inline void setDotP(const vector<real>& iDotP) {_DotP = iDotP;}
   inline void PushDotP(real iDotP) {
     _DotP.push_back(iDotP);
     if(iDotP > 0)
@@ -401,11 +401,11 @@ public:
     }
   }
   /*! modifiers */
-  inline void SetCenter(const Vec3r& iCenter) {_center = iCenter;}
+  inline void setCenter(const Vec3r& iCenter) {_center = iCenter;}
   void ComputeCenter();
-  inline void SetZ(real z) {_Z = z;}
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetDotP(real iDotP) 
+  inline void setZ(real z) {_Z = z;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setDotP(real iDotP) 
   {
     _dotp = iDotP;
     if(_dotp > 0)
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index 534c6e323a9..9d22b4f8db5 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -25,8 +25,8 @@ void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs)
 {
   WXShape *shape = new WXShape;
   buildWShape(*shape, ifs);
-  shape->SetId(ifs.getId().getFirst());
-  //ifs.SetId(shape->GetId());
+  shape->setId(ifs.getId().getFirst());
+  //ifs.setId(shape->GetId());
 }
 
 void WXEdgeBuilder::buildWVertices(WShape& shape,
@@ -37,7 +37,7 @@ void WXEdgeBuilder::buildWVertices(WShape& shape,
     vertex = new WXVertex(Vec3r(vertices[i],
 				      vertices[i + 1],
 				      vertices[i + 2]));
-    vertex->SetId(i / 3);
+    vertex->setId(i / 3);
     shape.AddVertex(vertex);
   }
 }
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index e611c1106f2..c95231a72dc 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -28,8 +28,8 @@ using namespace std;
 void WingedEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs) {
   WShape *shape = new WShape;
   buildWShape(*shape, ifs);
-  shape->SetId(ifs.getId().getFirst());
-  //ifs.SetId(shape->GetId());
+  shape->setId(ifs.getId().getFirst());
+  //ifs.setId(shape->GetId());
 }
 
 void WingedEdgeBuilder::visitNodeShape(NodeShape& ns) {
@@ -93,14 +93,14 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
 		const Material*const* mats = ifs.materials();
 		for(unsigned i=0; i<ifs.msize(); ++i)
 			materials.push_back(*(mats[i]));
-		shape.SetMaterials(materials);
+		shape.setMaterials(materials);
 	}
 
   //  const Material * mat = (ifs.material());
   //  if (mat)
-  //    shape.SetMaterial(*mat);
+  //    shape.setMaterial(*mat);
   //  else if(_current_material)
-  //    shape.SetMaterial(*_current_material);
+  //    shape.setMaterial(*_current_material);
 
   // sets the current WShape to shape
   _current_wshape = &shape;
@@ -193,7 +193,7 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
       ++fit;
     }
     if(normalsSet.size()!=1){
-      (*wv)->SetSmooth(false);
+      (*wv)->setSmooth(false);
     }
   }
   // Adds the new WShape to the WingedEdge structure
@@ -208,7 +208,7 @@ void WingedEdgeBuilder::buildWVertices(WShape& shape,
     vertex = new WVertex(Vec3r(vertices[i],
 			       vertices[i + 1],
 			       vertices[i + 2]));
-    vertex->SetId(i / 3);
+    vertex->setId(i / 3);
     shape.AddVertex(vertex);
   }
 }