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.

12 files changed, 103 insertions, 103 deletions

diff --git a/source/blender/freestyle/intern/app/AppCanvas.cpp b/source/blender/freestyle/intern/app/AppCanvas.cpp
index 60d36880c12..3ca06fddfe7 100755
--- a/source/blender/freestyle/intern/app/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app/AppCanvas.cpp
@@ -68,7 +68,7 @@ AppCanvas::~AppCanvas()
   _pViewer = 0;
 }
 
-void AppCanvas::SetViewer(AppGLWidget *iViewer)
+void AppCanvas::setViewer(AppGLWidget *iViewer)
 {
   _pViewer = iViewer;
 }  
@@ -181,7 +181,7 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
   //    qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
   //    
   //    GaussianFilter filter;
-  //    filter.SetSigma(4.0);
+  //    filter.setSigma(4.0);
   //    int bound = filter.getBound();
   //    QImage qtmp2(width(), height(), 32);
   //    for(int py2=0;py2<height();++py2){
@@ -246,7 +246,7 @@ void AppCanvas::Render(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
@@ -347,7 +347,7 @@ void AppCanvas::RenderBasic(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
diff --git a/source/blender/freestyle/intern/app/AppCanvas.h b/source/blender/freestyle/intern/app/AppCanvas.h
index 703970c0fb1..be02c02eab7 100755
--- a/source/blender/freestyle/intern/app/AppCanvas.h
+++ b/source/blender/freestyle/intern/app/AppCanvas.h
@@ -77,7 +77,7 @@ public:
   inline const AppGLWidget * viewer() const {return _pViewer;}
 
   /*! modifiers */
-  void SetViewer(AppGLWidget *iViewer) ;
+  void setViewer(AppGLWidget *iViewer) ;
 };
 
 
diff --git a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
index fe2ae994f77..ec7ee004bf3 100755
--- a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
@@ -33,7 +33,7 @@ AppDensityCurvesWindow::AppDensityCurvesWindow(QWidget *parent, const char *name
 AppDensityCurvesWindow::~AppDensityCurvesWindow(){ 
 }
 
-void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+void AppDensityCurvesWindow::setOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
   AppGL2DCurvesViewer * viewer = 0;
   switch(i){
   case 0:viewer = CurvesViewer0; break;
@@ -44,10 +44,10 @@ void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin, const
   default:return;
   }
   
-  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+  viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
 }
 
-void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+void AppDensityCurvesWindow::setLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
   AppGL2DCurvesViewer * viewer = 0;
   switch(i){
   case 1:viewer = LevelCurveViewer1; break;
@@ -61,5 +61,5 @@ void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const Vec2d
   default:return;
   }
   
-  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+  viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
 }
diff --git a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
index d7091440e06..2fda4da49d9 100755
--- a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
@@ -60,7 +60,7 @@ public:
    *  \param ylabel
    *    The label of the y-axis
    */
-  void SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+  void setOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
 
   /*! Sets the node that contains the level curve i in 
    *  viewer i (i in [1,8]).
@@ -77,7 +77,7 @@ public:
    *  \param ylabel
    *    The label of the y-axis
    */
-  void SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+  void setLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
 };
 
 #endif // APPDENSITYCURVESWINDOW_H
diff --git a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
index 0915a4c3cbd..c5ff7ef6a71 100755
--- a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
@@ -28,8 +28,8 @@
 AppGL2DCurvesViewer::AppGL2DCurvesViewer(QWidget *iParent, const char *iName)
 : QGLViewer(iParent)
 {
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
   _pGLRenderer = new GLRenderer;
 }
 AppGL2DCurvesViewer::~AppGL2DCurvesViewer(){
@@ -39,7 +39,7 @@ AppGL2DCurvesViewer::~AppGL2DCurvesViewer(){
     delete _pGLRenderer;
 }
   
-void AppGL2DCurvesViewer::SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel){
+void AppGL2DCurvesViewer::setRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel){
   _vmin = vmin;
   _vmax = vmax;
   _xmargin = (vmax.x()-vmin.x())/20.0;
@@ -53,8 +53,8 @@ void AppGL2DCurvesViewer::SetRange(const Vec2d& vmin, const Vec2d& vmax, const c
   if(ylabel)
     _ylabel = ylabel;
 }
-void AppGL2DCurvesViewer::SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel){
-  SetRange(vmin, vmax, xlabel, ylabel);
+void AppGL2DCurvesViewer::setCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel){
+  setRange(vmin, vmax, xlabel, ylabel);
   vector<Node*> nodes;
   _RootNode.RetrieveChildren(nodes);
   _RootNode.DetachChildren();
@@ -67,7 +67,7 @@ void AppGL2DCurvesViewer::SetCurve(const Vec2d& vmin, const Vec2d& vmax, const v
   _curve = iPoints;
   NodeGroup * curveNode = new NodeGroup;
   NodeShape * shape = new NodeShape;
-  shape->material().SetDiffuse(0,0,0,1);
+  shape->material().setDiffuse(0,0,0,1);
   curveNode->AddChild(shape);
   shape->AddRep(new LineRep(iPoints));
   for(vector<Vec3r>::const_iterator v=iPoints.begin(), vend=iPoints.end();
diff --git a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
index c0bb8b4109c..2bdefba2a90 100755
--- a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
@@ -46,8 +46,8 @@ public:
   
   /*! Sets the ranges.
    */
-  void SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel);
-  void SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel);
+  void setRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel);
+  void setCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel);
   void AddNode(Node* iNode);
   void DetachNode(Node* iNode);
   void RetrieveNodes(vector<Node*>& oNodes);
diff --git a/source/blender/freestyle/intern/app/AppGLWidget.cpp b/source/blender/freestyle/intern/app/AppGLWidget.cpp
index d59ad716c18..46e1f409cb2 100755
--- a/source/blender/freestyle/intern/app/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app/AppGLWidget.cpp
@@ -58,22 +58,22 @@ AppGLWidget::AppGLWidget(QWidget *iParent, const char *iName)
   _Fovy        = 30.f;
   //_SceneDepth = 2.f;
   _RenderStyle = LINE;
-  //_ModelRootNode->SetBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
+  //_ModelRootNode->setBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
   _ModelRootNode = new NodeDrawingStyle;
   _SilhouetteRootNode = new NodeDrawingStyle;
   _DebugRootNode = new NodeDrawingStyle;
   
   _RootNode.AddChild(_ModelRootNode);
-  _SilhouetteRootNode->SetStyle(DrawingStyle::LINES);
-  _SilhouetteRootNode->SetLightingEnabled(false);
-  _SilhouetteRootNode->SetLineWidth(2.f);
-  _SilhouetteRootNode->SetPointSize(3.f);
+  _SilhouetteRootNode->setStyle(DrawingStyle::LINES);
+  _SilhouetteRootNode->setLightingEnabled(false);
+  _SilhouetteRootNode->setLineWidth(2.f);
+  _SilhouetteRootNode->setPointSize(3.f);
 
   _RootNode.AddChild(_SilhouetteRootNode);
 
-  _DebugRootNode->SetStyle(DrawingStyle::LINES);
-  _DebugRootNode->SetLightingEnabled(false);
-  _DebugRootNode->SetLineWidth(1.f);
+  _DebugRootNode->setStyle(DrawingStyle::LINES);
+  _DebugRootNode->setLightingEnabled(false);
+  _DebugRootNode->setLineWidth(1.f);
   
   _RootNode.AddChild(_DebugRootNode);
 
@@ -91,23 +91,23 @@ AppGLWidget::AppGLWidget(QWidget *iParent, const char *iName)
 
   // 2D Scene
   //  _pFENode = new NodeDrawingStyle;
-  //  _pFENode->SetStyle(DrawingStyle::LINES);
-  //  _pFENode->SetLightingEnabled(false);
-  //  _pFENode->SetLineWidth(1.f);
+  //  _pFENode->setStyle(DrawingStyle::LINES);
+  //  _pFENode->setLightingEnabled(false);
+  //  _pFENode->setLineWidth(1.f);
   //
   //  _p2DNode.AddChild(_pFENode);
   //  
   //  _pVisibleSilhouetteNode = new NodeDrawingStyle;
-  //  _pVisibleSilhouetteNode->SetStyle(DrawingStyle::LINES);
-  //  _pVisibleSilhouetteNode->SetLightingEnabled(false);
-  //  _pVisibleSilhouetteNode->SetLineWidth(3.f);
+  //  _pVisibleSilhouetteNode->setStyle(DrawingStyle::LINES);
+  //  _pVisibleSilhouetteNode->setLightingEnabled(false);
+  //  _pVisibleSilhouetteNode->setLineWidth(3.f);
   //
   //  _p2DNode.AddChild(_pVisibleSilhouetteNode);
   //  
   _p2DSelectionNode = new NodeDrawingStyle;
-  _p2DSelectionNode->SetLightingEnabled(false);
-  _p2DSelectionNode->SetStyle(DrawingStyle::LINES);
-  _p2DSelectionNode->SetLineWidth(5.f);
+  _p2DSelectionNode->setLightingEnabled(false);
+  _p2DSelectionNode->setStyle(DrawingStyle::LINES);
+  _p2DSelectionNode->setLineWidth(5.f);
   
   _p2DNode.AddChild(_p2DSelectionNode);
 
@@ -188,7 +188,7 @@ AppGLWidget::~AppGLWidget()
   //saveToFile(filename);
 }
 
-void AppGLWidget::SetMainWindow(QMainWindow *iMainWindow) {
+void AppGLWidget::setMainWindow(QMainWindow *iMainWindow) {
 	_pMainWindow = iMainWindow;
 }
 void AppGLWidget::captureMovie()
@@ -315,18 +315,18 @@ AppGLWidget::select(const QMouseEvent *e) {
     _p2DSelectionNode->AddChild(g_pController->BuildRep(vedges.begin(), vedges.end()));
     // FEdge
     LineRep * fedgeRep = new LineRep(fe->vertexA()->point2d(), fe->vertexB()->point2d());
-    fedgeRep->SetWidth(3.f);
+    fedgeRep->setWidth(3.f);
     NodeShape * fedgeNode = new NodeShape;
     fedgeNode->AddRep(fedgeRep);
-    fedgeNode->material().SetDiffuse(0.2, 1, 0.2, 1.0);
+    fedgeNode->material().setDiffuse(0.2, 1, 0.2, 1.0);
     _p2DSelectionNode->AddChild(fedgeNode);
     //SVertex A
     Vec3r A(fe->vertexA()->point2d());
     VertexRep * aVertexRep = new VertexRep(A.x(), A.y(), A.z());
-    aVertexRep->SetPointSize(3.f);
+    aVertexRep->setPointSize(3.f);
     NodeShape * aVertexNode = new NodeShape;
     aVertexNode->AddRep(aVertexRep);
-    aVertexNode->material().SetDiffuse(1, 0, 0, 1.0);
+    aVertexNode->material().setDiffuse(1, 0, 0, 1.0);
     _p2DSelectionNode->AddChild(aVertexNode);
     // and its fedges
     const vector<FEdge*>& afedges = fe->vertexA()->fedges();
@@ -336,16 +336,16 @@ AppGLWidget::select(const QMouseEvent *e) {
     ++f)
     {
       LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
-      lrep->SetWidth(1.f);
+      lrep->setWidth(1.f);
       aVertexNode->AddRep(lrep);
     }
     //SVertex B
     Vec3r B(fe->vertexB()->point2d());
     VertexRep * bVertexRep = new VertexRep(B.x(), B.y(), B.z());
-    bVertexRep->SetPointSize(3.f);
+    bVertexRep->setPointSize(3.f);
     NodeShape * bVertexNode = new NodeShape;
     bVertexNode->AddRep(bVertexRep);
-    bVertexNode->material().SetDiffuse(0, 0, 1, 1.0);
+    bVertexNode->material().setDiffuse(0, 0, 1, 1.0);
     _p2DSelectionNode->AddChild(bVertexNode);
     // and its fedges
     const vector<FEdge*>& bfedges = fe->vertexB()->fedges();
@@ -356,7 +356,7 @@ AppGLWidget::select(const QMouseEvent *e) {
     ++f)
     {
       LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
-      lrep->SetWidth(1.f);
+      lrep->setWidth(1.f);
       bVertexNode->AddRep(lrep);
     }
 
@@ -458,9 +458,9 @@ AppGLWidget::keyPressEvent(QKeyEvent* e)
     }
     updateGL();
     break;
-  case Qt::Key_1: _ModelRootNode->SetStyle(DrawingStyle::FILLED); updateGL(); break;
-  case Qt::Key_2: _ModelRootNode->SetStyle(DrawingStyle::LINES); _ModelRootNode->SetLineWidth(1.0); updateGL(); break;
-  case Qt::Key_3: _ModelRootNode->SetStyle(DrawingStyle::INVISIBLE); updateGL(); break;
+  case Qt::Key_1: _ModelRootNode->setStyle(DrawingStyle::FILLED); updateGL(); break;
+  case Qt::Key_2: _ModelRootNode->setStyle(DrawingStyle::LINES); _ModelRootNode->setLineWidth(1.0); updateGL(); break;
+  case Qt::Key_3: _ModelRootNode->setStyle(DrawingStyle::INVISIBLE); updateGL(); break;
   case Qt::Key_B:
     {
 //       if(e->state() == ShiftButton)
@@ -737,7 +737,7 @@ void AppGLWidget::draw()
 
   if (true == _Draw2DScene) {
     Draw2DScene(_pGLRenderer);
-    Set3DContext();
+    set3DContext();
   }
   if(_record){
     saveSnapshot(true);
@@ -759,7 +759,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
 
   if(_drawEnvMap)
   {
-    _ModelRootNode->SetLightingEnabled(false);
+    _ModelRootNode->setLightingEnabled(false);
     glEnable(GL_COLOR_MATERIAL);
 
     glEnable(GL_TEXTURE_2D);
@@ -800,15 +800,15 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   }
 
   // FIXME
-  //  //_ModelRootNode->SetLightingEnabled(true);
+  //  //_ModelRootNode->setLightingEnabled(true);
   //  if(_ModelRootNode->style() == DrawingStyle::LINES){
   //    glPushAttrib(GL_ALL_ATTRIB_BITS);
   //    //glDisable(GL_COLOR_MATERIAL);
-  //    _ModelRootNode->SetStyle(DrawingStyle::FILLED);
-  //    _ModelRootNode->SetLightingEnabled(true);
+  //    _ModelRootNode->setStyle(DrawingStyle::FILLED);
+  //    _ModelRootNode->setLightingEnabled(true);
   //    _ModelRootNode->accept(*iRenderer);  
-  //    _ModelRootNode->SetStyle(DrawingStyle::LINES);
-  //    _ModelRootNode->SetLightingEnabled(false);
+  //    _ModelRootNode->setStyle(DrawingStyle::LINES);
+  //    _ModelRootNode->setLightingEnabled(false);
   //    _ModelRootNode->accept(*iRenderer);  
   //    glPopAttrib();
   //  }
@@ -819,7 +819,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   glDisable(GL_TEXTURE_GEN_T);
   glDisable(GL_TEXTURE_2D);
   glDisable(GL_COLOR_MATERIAL);
-  _ModelRootNode->SetLightingEnabled(true);
+  _ModelRootNode->setLightingEnabled(true);
 
   if(_fedges == true)
     _SilhouetteRootNode->accept(*iRenderer);
diff --git a/source/blender/freestyle/intern/app/AppGLWidget.h b/source/blender/freestyle/intern/app/AppGLWidget.h
index 24bb2c7229b..844af9f4037 100755
--- a/source/blender/freestyle/intern/app/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app/AppGLWidget.h
@@ -297,7 +297,7 @@ public:
   // when a model is added to the scene.
   void ReInitRenderers();
 
-  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->setSelectedFEdge(iFEdge); }
 
   inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
   inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
diff --git a/source/blender/freestyle/intern/app/AppMainWindow.cpp b/source/blender/freestyle/intern/app/AppMainWindow.cpp
index 03b4f3a28ea..f869eb8e637 100755
--- a/source/blender/freestyle/intern/app/AppMainWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppMainWindow.cpp
@@ -40,7 +40,7 @@ AppMainWindow::AppMainWindow(QWidget *parent, const char *name, Qt::WindowFlags
 
   // setCaption(Config::APPLICATION_NAME + " " + Config::APPLICATION_VERSION);
   setGeometry(20,20,700,700);
-  pQGLWidget->SetMainWindow(this);
+  pQGLWidget->setMainWindow(this);
 
   _ProgressBar = new QProgressDialog(Config::APPLICATION_NAME + " Progress Dialog", "Cancel", 
 				     0, 100, this);
diff --git a/source/blender/freestyle/intern/app/Controller.cpp b/source/blender/freestyle/intern/app/Controller.cpp
index ac41b31ac78..fc4912af5e6 100755
--- a/source/blender/freestyle/intern/app/Controller.cpp
+++ b/source/blender/freestyle/intern/app/Controller.cpp
@@ -194,7 +194,7 @@ void Controller::SetView(AppGLWidget *iView)
   
   _pView = iView;
   //_pView2D->setGeometry(_pView->rect());
-  _Canvas->SetViewer(_pView);
+  _Canvas->setViewer(_pView);
 }
 
 void Controller::SetMainWindow(AppMainWindow *iMainWindow)
@@ -257,7 +257,7 @@ int Controller::Load3DSFile(const char *iFileName)
   _RootNode->AddChild(maxScene);
   _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
 
-  _pView->SetModel(_RootNode);
+  _pView->setModel(_RootNode);
   _pView->FitBBox();
   
   _pMainWindow->DisplayMessage("Building Winged Edge structure");
@@ -299,7 +299,7 @@ int Controller::Load3DSFile(const char *iFileName)
 
   _ProgressBar->setProgress(3);
    
-  _pView->SetDebug(_DebugNode);
+  _pView->setDebug(_DebugNode);
 
   //delete stuff
   //  if(0 != ws_builder)
@@ -571,8 +571,8 @@ void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
   _pMainWindow->DisplayMessage("Updating display");
   ViewMapTesselator3D sTesselator3d;
   //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
+  //sTesselator2d.setNature(_edgeTesselationNature);
+  sTesselator3d.setNature(_edgeTesselationNature);
   
   // Tesselate the 3D edges:
   _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
@@ -653,7 +653,7 @@ void Controller::ComputeViewMap()
   // Restore the context of view:
   // we need to perform all these operations while the 
   // 3D context is on.
-  _pView->Set3DContext();
+  _pView->set3DContext();
   float src[3] = { 0, 0, 0 };
   float vp_tmp[3];
   _pView->camera()->getWorldCoordinatesOf(src, vp_tmp);
@@ -673,9 +673,9 @@ void Controller::ComputeViewMap()
 
   _Chrono.start();
   if (_SceneNumFaces > 2000)
-    edgeDetector.SetProgressBar(_ProgressBar);
+    edgeDetector.setProgressBar(_ProgressBar);
  
-  edgeDetector.SetViewpoint(Vec3r(vp));
+  edgeDetector.setViewpoint(Vec3r(vp));
   edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
   edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
   edgeDetector.setSphereRadius(_sphereRadius);
@@ -758,7 +758,7 @@ void Controller::ComputeViewMap()
     //        if((res == GeomUtils::DO_INTERSECT) && (t>=0.0) && (t<=1.0)){
     //          Vec3r inter(oppositeEdge->GetaVertex()->GetVertex() + t*v1v2);
     //          VertexRep * irep = new VertexRep(inter.x(), inter.y(), inter.z());
-    //          irep->SetPointSize(5.0);
+    //          irep->setPointSize(5.0);
     //          silhouetteDebugShape->AddRep(irep);
     //        }     
 // 	 }  
@@ -789,9 +789,9 @@ void Controller::ComputeViewMap()
 //        silhouetteDebugShape->AddRep(line);
 //      }
 //      Material redmat;
-//      redmat.SetDiffuse(1,0,0,1);
+//      redmat.setDiffuse(1,0,0,1);
 //      Material greenmat;
-//      greenmat.SetDiffuse(0,1,0,1);
+//      greenmat.setDiffuse(0,1,0,1);
 //      real vecSize = _bboxDiag/70.0;
 //      vector<WXFaceLayer*> flayers;
 //      wxf->retrieveSmoothLayers(Nature::RIDGE, flayers);
@@ -831,17 +831,17 @@ void Controller::ComputeViewMap()
         //          Curvature_info * ci = fci->vec_curvature_info[i];
         //          Vec3r v(wxf->GetVertex(i)->GetVertex());
         //          //          VertexRep *vrep = new VertexRep(v[0], v[1], v[2]);
-        //          //          vrep->SetMaterial(redmat);
-        //          //          vrep->SetPointSize(5.0);
+        //          //          vrep->setMaterial(redmat);
+        //          //          vrep->setPointSize(5.0);
         //          //          silhouetteDebugShape->AddRep(vrep);
         //          //          LineRep * maxc = new LineRep(v-vecSize*ci->e1/2.0, v+vecSize*ci->e1/2.0);
         //          //          LineRep * maxc = new LineRep(v, v+vecSize*ci->e1);
-        //          //          maxc->SetMaterial(redmat);
-        //          //          maxc->SetWidth(2.0);
+        //          //          maxc->setMaterial(redmat);
+        //          //          maxc->setWidth(2.0);
         //          //          silhouetteDebugShape->AddRep(maxc);
         //          LineRep * minc = new LineRep(v, v+vecSize*ci->e2);
-        //          minc->SetMaterial(greenmat);
-        //          minc->SetWidth(2.0);
+        //          minc->setMaterial(greenmat);
+        //          minc->setWidth(2.0);
         //          silhouetteDebugShape->AddRep(minc);
         //        }
 //      }
@@ -888,21 +888,21 @@ void Controller::ComputeViewMap()
   // Builds the view map structure from the flagged WSEdge structure:
   //----------------------------------------------------------
   ViewMapBuilder vmBuilder;
-  vmBuilder.SetProgressBar(_ProgressBar);
-  vmBuilder.SetEnableQI(_EnableQI);
-  vmBuilder.SetViewpoint(Vec3r(vp));
+  vmBuilder.setProgressBar(_ProgressBar);
+  vmBuilder.setEnableQI(_EnableQI);
+  vmBuilder.setViewpoint(Vec3r(vp));
   
-  vmBuilder.SetTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
-  vmBuilder.SetFrustum(_pView->znear(), _pView->zfar());
+  vmBuilder.setTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
+  vmBuilder.setFrustum(_pView->znear(), _pView->zfar());
   
-  vmBuilder.SetGrid(&_Grid);
+  vmBuilder.setGrid(&_Grid);
   
   // Builds a tesselated form of the silhouette for display purpose:
   //---------------------------------------------------------------
   ViewMapTesselator3D sTesselator3d;
   //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
+  //sTesselator2d.setNature(_edgeTesselationNature);
+  sTesselator3d.setNature(_edgeTesselationNature);
     
   _Chrono.start();
   // Build View Map
@@ -1016,10 +1016,10 @@ void Controller::ComputeViewMap()
   //          positive = true;
   //      }
   //      if(positive)
-  //        mat.SetDiffuse(1,1,0,1);
+  //        mat.setDiffuse(1,1,0,1);
   //      else
-  //        mat.SetDiffuse(1,0,0,1);
-  //      lrep->SetMaterial(mat);
+  //        mat.setDiffuse(1,0,0,1);
+  //      lrep->setMaterial(mat);
   //      fe = fe->nextEdge();
   //    }while((fe!=0) && (fe!=fefirst));
   //  }
@@ -1060,7 +1060,7 @@ void Controller::ComputeSteerableViewMap(){
     ng[i] = new NodeGroup;
   }
   NodeShape *completeNS = new NodeShape;
-  completeNS->material().SetDiffuse(c,c,c,1);
+  completeNS->material().setDiffuse(c,c,c,1);
   ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
   SteerableViewMap * svm = _Canvas->getSteerableViewMap();
   svm->Reset();
@@ -1082,7 +1082,7 @@ void Controller::ComputeSteerableViewMap(){
       double wc = oweights[i]*c;
       if(oweights[i] == 0)
         continue;
-      ns->material().SetDiffuse(wc, wc, wc, 1);
+      ns->material().setDiffuse(wc, wc, wc, 1);
       ns->AddRep(fRep);
       ng[i]->AddChild(ns);
     }
@@ -1318,7 +1318,7 @@ void Controller::SwapStyleModules(unsigned i1, unsigned i2)
 
 void Controller::toggleLayer(unsigned index, bool iDisplay)
 {
-  _Canvas->SetVisible(index, iDisplay);
+  _Canvas->setVisible(index, iDisplay);
   _pView->updateGL();
 }
 
@@ -1371,8 +1371,8 @@ FEdge* Controller::SelectFEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return fedge;
 }
 
@@ -1383,8 +1383,8 @@ ViewEdge* Controller::SelectViewEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return selection;
 }
 
@@ -1393,8 +1393,8 @@ NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin,
 {
   ViewMapTesselator2D tesselator2D;
   Material mat;
-  mat.SetDiffuse(1,1,0.3,1);
-  tesselator2D.SetMaterial(mat);
+  mat.setDiffuse(1,1,0.3,1);
+  tesselator2D.setMaterial(mat);
 
   return (tesselator2D.Tesselate(vedges_begin, vedges_end));
 }
@@ -1491,8 +1491,8 @@ void Controller::displayDensityCurves(int x, int y){
 
   // display the curves
   for(i=0; i<nbCurves; ++i)
-    _pDensityCurvesWindow->SetOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
+    _pDensityCurvesWindow->setOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
   for(i=1; i<=8; ++i)
-    _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+    _pDensityCurvesWindow->setLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
   _pDensityCurvesWindow->show();
 }
diff --git a/source/blender/freestyle/intern/app/Main.cpp b/source/blender/freestyle/intern/app/Main.cpp
index ae4d28017c5..4f2556ed740 100755
--- a/source/blender/freestyle/intern/app/Main.cpp
+++ b/source/blender/freestyle/intern/app/Main.cpp
@@ -44,8 +44,8 @@ int main(int argc, char** argv)
   //app->setMainWidget(mainWindow); // QT3
 
   g_pController = new Controller;
-  g_pController->SetMainWindow(&mainWindow);
-  g_pController->SetView(mainWindow.pQGLWidget);
+  g_pController->setMainWindow(&mainWindow);
+  g_pController->setView(mainWindow.pQGLWidget);
   
   mainWindow.show();
 
diff --git a/source/blender/freestyle/intern/app/QGLBasicWidget.cpp b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
index 44b5e0de224..0f690b67431 100755
--- a/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
+++ b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
@@ -37,8 +37,8 @@ QGLBasicWidget::QGLBasicWidget( QWidget* parent, const char* name, int w, int h,
 //   _Pbuffer->create(false);
 // #endif 
   resizeGL(w,h);
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
 }
 
 QGLBasicWidget::QGLBasicWidget( const QGLFormat& format, QWidget* parent, const char* name, 
@@ -54,8 +54,8 @@ QGLBasicWidget::QGLBasicWidget( const QGLFormat& format, QWidget* parent, const
 //   _Pbuffer->create(false);
 // #endif 
   resizeGL(w,h);
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
 }
 
 QGLBasicWidget::~QGLBasicWidget()