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.

18 files changed, 54 insertions, 54 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
index e2be6fa8264..58dcf4fede9 100755
--- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
@@ -44,10 +44,10 @@ public:
   /*! operators */
   inline DrawingStyle& operator=(const DrawingStyle& ds);
   
-  inline void SetStyle(const STYLE iStyle) {Style = iStyle;}
-  inline void SetLineWidth(const float iLineWidth) {LineWidth = iLineWidth;}
-  inline void SetPointSize(const float iPointSize) {PointSize = iPointSize;}
-  inline void SetLightingEnabled(const bool on) {LightingEnabled = on;}
+  inline void setStyle(const STYLE iStyle) {Style = iStyle;}
+  inline void setLineWidth(const float iLineWidth) {LineWidth = iLineWidth;}
+  inline void setPointSize(const float iPointSize) {PointSize = iPointSize;}
+  inline void setLightingEnabled(const bool on) {LightingEnabled = on;}
 
   inline STYLE style() const {return Style;}
   inline float lineWidth() const {return LineWidth;}
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index ec3d3ad748c..2604484ecd7 100755
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
@@ -317,5 +317,5 @@ void IndexedFaceSet::ComputeBBox()
     v++;
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
index c6951942dbb..ce0afcd2fd6 100755
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
@@ -166,7 +166,7 @@ public:
   virtual void ComputeBBox();
 
   /*! modifiers */
-  inline void SetDisplayList(unsigned int index) {_displayList = index;}
+  inline void setDisplayList(unsigned int index) {_displayList = index;}
 
   /*! Accessors */
   virtual const real * vertices() const {return _Vertices;}
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
index 9dec2ec803f..504db06acf4 100755
--- a/source/blender/freestyle/intern/scene_graph/LineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
@@ -54,5 +54,5 @@ void LineRep::ComputeBBox()
       ZMin = (*v)[2];
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h
index 1bbba130ba3..232557af857 100755
--- a/source/blender/freestyle/intern/scene_graph/LineRep.h
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.h
@@ -55,7 +55,7 @@ public:
   inline LineRep(const Vec3r& v1, const Vec3r& v2)
     : Rep()
   {
-    SetStyle(LINES);
+    setStyle(LINES);
     AddVertex(v1);
     AddVertex(v2);
     _width = 0.f;
@@ -66,7 +66,7 @@ public:
     : Rep()
   {
     _vertices = vertices;
-    SetStyle(LINE_STRIP);
+    setStyle(LINE_STRIP);
     _width = 0.f;
   }
 
@@ -80,7 +80,7 @@ public:
     {
       _vertices.push_back(*v);
     }
-    SetStyle(LINE_STRIP);
+    setStyle(LINE_STRIP);
     _width = 0.f;
   }
 
@@ -95,9 +95,9 @@ public:
   inline float width() const {return _width;}
 
   /*! modifiers */
-  inline void SetStyle(const LINES_STYLE iStyle) {_Style = iStyle;}
+  inline void setStyle(const LINES_STYLE iStyle) {_Style = iStyle;}
   inline void AddVertex(const Vec3r& iVertex) {_vertices.push_back(iVertex);}
-  inline void SetVertices(const vector<Vec3r>& iVertices)
+  inline void setVertices(const vector<Vec3r>& iVertices)
   {
     if(0 != _vertices.size())
     {
@@ -110,7 +110,7 @@ public:
           _vertices.push_back(*v);
         }
   }
-  inline void SetWidth(float iWidth) {_width=iWidth;}
+  inline void setWidth(float iWidth) {_width=iWidth;}
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v) {
diff --git a/source/blender/freestyle/intern/scene_graph/Material.h b/source/blender/freestyle/intern/scene_graph/Material.h
index 09557ad3473..64ae526ccb0 100755
--- a/source/blender/freestyle/intern/scene_graph/Material.h
+++ b/source/blender/freestyle/intern/scene_graph/Material.h
@@ -120,7 +120,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetDiffuse(const float r, const float g, const float b, const float a);
+  inline void setDiffuse(const float r, const float g, const float b, const float a);
   /*! Sets the specular color.
    *    \param r
    *      Red component
@@ -131,7 +131,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetSpecular(const float r, const float g, const float b, const float a);
+  inline void setSpecular(const float r, const float g, const float b, const float a);
   /*! Sets the ambiant color.
    *    \param r
    *      Red component
@@ -142,7 +142,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetAmbient(const float r, const float g, const float b, const float a);
+  inline void setAmbient(const float r, const float g, const float b, const float a);
 
   /*! Sets the emissive color.
    *    \param r
@@ -154,13 +154,13 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetEmission(const float r, const float g, const float b, const float a);
+  inline void setEmission(const float r, const float g, const float b, const float a);
 
   /*! Sets the shininess.
    *    \param s
    *      Shininess
    */
-  inline void SetShininess(const float s);
+  inline void setShininess(const float s);
 
   /* operators */
   inline Material& operator=(const Material& m);
@@ -225,7 +225,7 @@ Material::Material(const Material& m)
   Shininess = m.shininess();
 }
 
-void Material::SetDiffuse(const float r, const float g, const float b, const float a)
+void Material::setDiffuse(const float r, const float g, const float b, const float a)
 {
   Diffuse[0] = r;
   Diffuse[1] = g;
@@ -233,7 +233,7 @@ void Material::SetDiffuse(const float r, const float g, const float b, const flo
   Diffuse[3] = a;
 }
 
-void Material::SetSpecular(const float r, const float g, const float b, const float a)
+void Material::setSpecular(const float r, const float g, const float b, const float a)
 {
   Specular[0] = r;
   Specular[1] = g;
@@ -241,7 +241,7 @@ void Material::SetSpecular(const float r, const float g, const float b, const fl
   Specular[3] = a;
 }
   
-void Material::SetAmbient(const float r, const float g, const float b, const float a)
+void Material::setAmbient(const float r, const float g, const float b, const float a)
 {
   Ambient[0] = r;
   Ambient[1] = g;
@@ -249,7 +249,7 @@ void Material::SetAmbient(const float r, const float g, const float b, const flo
   Ambient[3] = a;
 }
 
-void Material::SetEmission(const float r, const float g, const float b, const float a)
+void Material::setEmission(const float r, const float g, const float b, const float a)
 {
   Emission[0] = r;
   Emission[1] = g;
@@ -257,7 +257,7 @@ void Material::SetEmission(const float r, const float g, const float b, const fl
   Emission[3] = a;
 }
 
-void Material::SetShininess(const float s)
+void Material::setShininess(const float s)
 {
   Shininess = s;
 }
diff --git a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
index 515874c4021..a6d3b8f8721 100755
--- a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
@@ -58,7 +58,7 @@ MaxFileLoader::~MaxFileLoader()
   _Scene = NULL;
 }
 
-void MaxFileLoader::SetFileName(const char *iFileName)
+void MaxFileLoader::setFileName(const char *iFileName)
 {
   if(NULL != _FileName)
     delete [] _FileName;
@@ -224,17 +224,17 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
 
         if (mat) 
         {
-          tmpMat.SetDiffuse(mat->diffuse[0], mat->diffuse[1], mat->diffuse[2], mat->diffuse[3]);
-          tmpMat.SetSpecular(mat->specular[0], mat->specular[1], mat->specular[2], mat->specular[3]);
+          tmpMat.setDiffuse(mat->diffuse[0], mat->diffuse[1], mat->diffuse[2], mat->diffuse[3]);
+          tmpMat.setSpecular(mat->specular[0], mat->specular[1], mat->specular[2], mat->specular[3]);
           float s = (float)pow(2.0, 10.0*mat->shininess);
           if(s > 128.f)
             s = 128.f;
-          tmpMat.SetShininess(s);
+          tmpMat.setShininess(s);
         }
         
         if(meshMaterials.empty()){
           meshMaterials.push_back(tmpMat);
-          shape->SetMaterial(tmpMat);
+          shape->setMaterial(tmpMat);
         }else{
           // find if the material is aleady in the list
           unsigned i=0;
@@ -357,12 +357,12 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
                                0,0,
                                0);
 	  // sets the id of the rep
-	  rep->SetId(Id(iNode->node_id, 0));
+	  rep->setId(Id(iNode->node_id, 0));
 
 
       const BBox<Vec3r> bbox = BBox<Vec3r>(Vec3r(minBBox[0], minBBox[1], minBBox[2]), 
                                            Vec3r(maxBBox[0], maxBBox[1], maxBBox[2]));
-      rep->SetBBox(bbox);
+      rep->setBBox(bbox);
       shape->AddRep(rep);
     }
 
@@ -376,7 +376,7 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
           for(unsigned j=0; j<4; j++)
             M44f(i,j) = iNode->matrix[j][i];
           
-          currentMesh->SetMatrix(Matrix44r(M44f));
+          currentMesh->setMatrix(Matrix44r(M44f));
           currentMesh->Translate(-d->pivot[0], -d->pivot[1], -d->pivot[2]);
       }
       shape = (NodeShape*)iNode->user.d;
diff --git a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
index 179f9a016df..ce71ab4be3b 100755
--- a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
@@ -70,7 +70,7 @@ public:
   virtual ~MaxFileLoader();
 
   /*! Sets the name of the 3dsMax file to load */
-  void SetFileName(const char *iFileName);
+  void setFileName(const char *iFileName);
 
   /*! Loads the 3D scene and returns 
    *  a pointer to the scene root node
diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 1726dd3c853..41afaa353be 100755
--- a/source/blender/freestyle/intern/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
@@ -68,7 +68,7 @@ public:
   virtual const BBox<Vec3r>& bbox() const {return _BBox;}
 
   /*! Sets the Node bounding box */
-  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+  virtual void setBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
 
   /*! Makes the union of _BBox and iBox */
   virtual void AddBBox(const BBox<Vec3r>& iBox) 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
index 18442ae10f9..012f963ea8c 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
@@ -43,16 +43,16 @@ public:
   virtual ~NodeDrawingStyle() {}
 
   inline const DrawingStyle& drawingStyle() const { return _DrawingStyle; }
-  inline void SetDrawingStyle(const DrawingStyle& iDrawingStyle) { _DrawingStyle = iDrawingStyle; }
+  inline void setDrawingStyle(const DrawingStyle& iDrawingStyle) { _DrawingStyle = iDrawingStyle; }
 
   /*! Sets the style. Must be one of FILLED, LINES, POINTS, INVISIBLE. */
-  inline void SetStyle(const DrawingStyle::STYLE iStyle) { _DrawingStyle.SetStyle(iStyle); }
+  inline void setStyle(const DrawingStyle::STYLE iStyle) { _DrawingStyle.setStyle(iStyle); }
   /*! Sets the line width in the LINES style case */
-  inline void SetLineWidth(const float iLineWidth) { _DrawingStyle.SetLineWidth(iLineWidth); }
+  inline void setLineWidth(const float iLineWidth) { _DrawingStyle.setLineWidth(iLineWidth); }
   /*! Sets the Point size in the POINTS style case */
-  inline void SetPointSize(const float iPointSize) { _DrawingStyle.SetPointSize(iPointSize); }
+  inline void setPointSize(const float iPointSize) { _DrawingStyle.setPointSize(iPointSize); }
   /*! Enables or disables the lighting. TRUE = enable */
-  inline void SetLightingEnabled(const bool iEnableLighting) { _DrawingStyle.SetLightingEnabled(iEnableLighting); }
+  inline void setLightingEnabled(const bool iEnableLighting) { _DrawingStyle.setLightingEnabled(iEnableLighting); }
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v);
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h
index 3e963beec38..34b049bfeb5 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeShape.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h
@@ -71,7 +71,7 @@ public:
   virtual void accept(SceneVisitor& v);
 
   /*! Sets the shape material */
-  inline void SetMaterial(const Material& iMaterial) { _Material = iMaterial; }
+  inline void setMaterial(const Material& iMaterial) { _Material = iMaterial; }
 
   /*! accessors */
   /*! returns the shape's material */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
index 64e9b7a4dd6..8f706c78259 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
@@ -91,7 +91,7 @@ void NodeTransform::MultiplyMatrix(const Matrix44r &iMatrix)
   _Matrix = mat_tmp * iMatrix;
 }
 
-void NodeTransform::SetMatrix(const Matrix44r &iMatrix)
+void NodeTransform::setMatrix(const Matrix44r &iMatrix)
 {
   _Matrix = iMatrix;
   if(isScaled(iMatrix))
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
index 3929c60996b..e75132466f0 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
@@ -77,7 +77,7 @@ public:
   void MultiplyMatrix(const Matrix44r &iMatrix);
 
   /*! Sets the current matrix to iMatrix */
-  void SetMatrix(const Matrix44r &iMatrix);
+  void setMatrix(const Matrix44r &iMatrix);
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v);
diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h
index 6ccc2152c48..ee5f2942abf 100755
--- a/source/blender/freestyle/intern/scene_graph/Rep.h
+++ b/source/blender/freestyle/intern/scene_graph/Rep.h
@@ -111,9 +111,9 @@ public:
   inline const Material * material() const {return _Material;}
 
   /*! Sets the Rep bounding box */
-  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
-  inline void SetId(const Id& id) {_Id = id;}
-  inline void SetMaterial(const Material& iMaterial) 
+  virtual void setBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+  inline void setId(const Id& id) {_Id = id;}
+  inline void setMaterial(const Material& iMaterial) 
   {
     _Material = new Material(iMaterial);
   }
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
index 215124b0676..f73a8498714 100755
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
@@ -55,5 +55,5 @@ void TriangleRep::ComputeBBox()
 
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
index 20df12cfd8f..9d986857060 100755
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
@@ -85,11 +85,11 @@ public:
   inline const Vec3r& vertex(int index) const {return _vertices[index];}
   inline const Vec3r& color(int index) const {return _colors[index];}
   /*! modifiers */
-  inline void SetStyle(const TRIANGLE_STYLE iStyle) {_Style = iStyle;}
-  inline void SetVertex(int index, const Vec3r& iVertex) {_vertices[index] = iVertex;}
-  inline void SetColor(int index, const Vec3r& iColor) {_colors[index] = iColor;}
-  inline void SetVertices(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2) {_vertices[0] = v0; _vertices[1] = v1; _vertices[2] = v2;}
-  inline void SetColors(const Vec3r& c0, const Vec3r& c1, const Vec3r& c2) {_colors[0] = c0; _colors[1] = c1; _colors[2] = c2;}
+  inline void setStyle(const TRIANGLE_STYLE iStyle) {_Style = iStyle;}
+  inline void setVertex(int index, const Vec3r& iVertex) {_vertices[index] = iVertex;}
+  inline void setColor(int index, const Vec3r& iColor) {_colors[index] = iColor;}
+  inline void setVertices(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2) {_vertices[0] = v0; _vertices[1] = v1; _vertices[2] = v2;}
+  inline void setColors(const Vec3r& c0, const Vec3r& c1, const Vec3r& c2) {_colors[0] = c0; _colors[1] = c1; _colors[2] = c2;}
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v) {
diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.cpp b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
index 1ecb5f141e1..e4f774bfb84 100755
--- a/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
@@ -24,6 +24,6 @@
 void VertexRep::ComputeBBox()
 {
 
-  SetBBox(BBox<Vec3r>(Vec3r(_coordinates[0], _coordinates[1], _coordinates[2]), 
+  setBBox(BBox<Vec3r>(Vec3r(_coordinates[0], _coordinates[1], _coordinates[2]), 
                       Vec3r(_coordinates[0], _coordinates[1], _coordinates[2])));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h
index 9dce7fbbe9c..9e31b4b8ef9 100755
--- a/source/blender/freestyle/intern/scene_graph/VertexRep.h
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h
@@ -71,12 +71,12 @@ public:
   inline float pointSize() const {return _PointSize;}
 
   /*! modifiers */
-  inline void SetVid(int id) {_vid = id;}
+  inline void setVid(int id) {_vid = id;}
   inline void setX(real x) {_coordinates[0] = x;}
   inline void setY(real y) {_coordinates[1] = y;}
   inline void setZ(real z) {_coordinates[2] = z;}
-  inline void SetCoordinates(real x, real y, real z) {_coordinates[0] = x;_coordinates[1] = y; _coordinates[2] = z;}
-  inline void SetPointSize(float iPointSize) {_PointSize = iPointSize;}
+  inline void setCoordinates(real x, real y, real z) {_coordinates[0] = x;_coordinates[1] = y; _coordinates[2] = z;}
+  inline void setPointSize(float iPointSize) {_PointSize = iPointSize;}
 
 private:
   int _vid; // vertex id