Yet another big style clean-up patch by Bastien Montagne, thanks a lot!

Now the code style is acceptable for the merge now, according to Bastien.
Thanks again Bastien for having this done! :)

1 files changed, 362 insertions, 318 deletions

diff --git a/source/blender/freestyle/intern/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp
index 7a7d0a51d4b..104040fd2a5 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.cpp
+++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp
@@ -1,370 +1,414 @@
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/freestyle/intern/view_map/Silhouette.cpp
+ *  \ingroup freestyle
+ *  \brief Classes to define a silhouette structure
+ *  \author Stephane Grabli
+ *  \date 25/03/2002
+ */
 
 #include "Silhouette.h"
 #include "ViewMap.h"
 
-                  /**********************************/
-                  /*                                */
-                  /*                                */
-                  /*             SVertex            */
-                  /*                                */
-                  /*                                */
-                  /**********************************/
+/**********************************/
+/*                                */
+/*                                */
+/*             SVertex            */
+/*                                */
+/*                                */
+/**********************************/
+
+Nature::VertexNature SVertex::getNature() const
+{
+	Nature::VertexNature nature = Nature::S_VERTEX;
+	if (_pViewVertex)
+		nature |= _pViewVertex->getNature();
+	return nature;
+}
+
+SVertex *SVertex::castToSVertex()
+{
+	return this;
+}
+
+ViewVertex *SVertex::castToViewVertex()
+{
+	return _pViewVertex;
+}
+
+NonTVertex *SVertex::castToNonTVertex()
+{
+	return dynamic_cast<NonTVertex*>(_pViewVertex);
+}
+
+TVertex *SVertex::castToTVertex()
+{
+	return dynamic_cast<TVertex*>(_pViewVertex);
+}
 
-Nature::VertexNature SVertex::getNature() const {
-  Nature::VertexNature nature = Nature::S_VERTEX;
-  if (_pViewVertex)
-    nature |= _pViewVertex->getNature();
-  return nature;
+float SVertex::shape_importance() const
+{
+	return shape()->importance();
 }
 
-SVertex * SVertex::castToSVertex(){
-  return this;
+#if 0
+Material SVertex::material() const
+{
+	return _Shape->material();
 }
+#endif
 
-ViewVertex * SVertex::castToViewVertex(){
-  return _pViewVertex;
+Id SVertex::shape_id() const
+{
+	return _Shape->getId();
 }
 
-NonTVertex * SVertex::castToNonTVertex(){
-  return dynamic_cast<NonTVertex*>(_pViewVertex);
+const SShape *SVertex::shape() const
+{
+	return _Shape;
 }
 
-TVertex * SVertex::castToTVertex(){
-  return dynamic_cast<TVertex*>(_pViewVertex);
+const int SVertex::qi() const
+{
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->qi();
 }
 
-float SVertex::shape_importance() const 
+occluder_container::const_iterator SVertex::occluders_begin() const
 {
-  return shape()->importance();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occluders_begin();
 }
- 
-//Material SVertex::material() const {return _Shape->material();}
-Id SVertex::shape_id() const {return _Shape->getId();}
-const SShape *  SVertex::shape() const {return _Shape;}
 
-const int SVertex::qi() const 
+occluder_container::const_iterator SVertex::occluders_end() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->qi();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occluders_end();
 }
 
-occluder_container::const_iterator SVertex::occluders_begin() const 
+bool SVertex::occluders_empty() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occluders_begin();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occluders_empty();
 }
 
-occluder_container::const_iterator SVertex::occluders_end() const 
+int SVertex::occluders_size() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occluders_end();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occluders_size();
 }
 
-bool SVertex::occluders_empty() const 
+const Polygon3r& SVertex::occludee() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occluders_empty();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occludee();
 }
 
-int SVertex::occluders_size() const 
+const SShape *SVertex::occluded_shape() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occluders_size();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occluded_shape();
 }
 
-const Polygon3r& SVertex::occludee() const 
+const bool SVertex::occludee_empty() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occludee();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->occludee_empty();
 }
 
-const SShape* SVertex::occluded_shape() const 
+real SVertex::z_discontinuity() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occluded_shape();
+	if (getNature() & Nature::T_VERTEX)
+		Exception::raiseException();
+	return (_FEdges[0])->z_discontinuity();
 }
 
-const bool  SVertex::occludee_empty() const
+FEdge *SVertex::fedge()
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->occludee_empty();
+	if (getNature() & Nature::T_VERTEX)
+		return NULL;
+	return _FEdges[0];
 }
 
-real SVertex::z_discontinuity() const 
+FEdge *SVertex::getFEdge(Interface0D& inter)
 {
-  if (getNature() & Nature::T_VERTEX)
-    Exception::raiseException();
-  return (_FEdges[0])->z_discontinuity();
+	FEdge *result = NULL;
+	SVertex *iVertexB = dynamic_cast<SVertex*>(&inter);
+	if (!iVertexB)
+		return result;
+	vector<FEdge*>::const_iterator fe = _FEdges.begin(), feend = _FEdges.end();
+	for (; fe != feend; ++fe) {
+		if ((((*fe)->vertexA() == this) && ((*fe)->vertexB() == iVertexB)) ||
+		    (((*fe)->vertexB() == this) && ((*fe)->vertexA() == iVertexB)))
+			result = (*fe);
+	}
+	if ((result == 0) && (getNature() & Nature::T_VERTEX)) {
+		SVertex *brother;
+		ViewVertex *vvertex = viewvertex();
+		TVertex *tvertex = dynamic_cast<TVertex*>(vvertex);
+		if (tvertex) {
+			brother = tvertex->frontSVertex();
+			if (this == brother)
+				brother = tvertex->backSVertex();
+			const vector<FEdge*>& fedges = brother->fedges();
+			for (fe = fedges.begin(), feend = fedges.end(); fe != feend; ++fe) {
+				if ((((*fe)->vertexA() == brother) && ((*fe)->vertexB() == iVertexB)) ||
+				    (((*fe)->vertexB() == brother) && ((*fe)->vertexA() == iVertexB)))
+					result = (*fe);
+			}
+		}
+	}
+	if ((result == 0) && (iVertexB->getNature() & Nature::T_VERTEX)) {
+		SVertex *brother;
+		ViewVertex *vvertex = iVertexB->viewvertex();
+		TVertex *tvertex = dynamic_cast<TVertex*>(vvertex);
+		if (tvertex) {
+			brother = tvertex->frontSVertex();
+			if (iVertexB == brother)
+				brother = tvertex->backSVertex();
+			for (fe = _FEdges.begin(), feend = _FEdges.end(); fe != feend; ++fe) {
+				if ((((*fe)->vertexA() == this) && ((*fe)->vertexB() == brother)) ||
+				    (((*fe)->vertexB() == this) && ((*fe)->vertexA() == brother)))
+					result = (*fe);
+			}
+		}
+	}
+
+	return result;
 }
 
-FEdge* SVertex::fedge()
+
+/**********************************/
+/*                                */
+/*                                */
+/*             FEdge              */
+/*                                */
+/*                                */
+/**********************************/
+
+
+int FEdge::viewedge_nature() const
 {
-  if (getNature() & Nature::T_VERTEX)
-    return 0;
-  return _FEdges[0];
+	return _ViewEdge->getNature();
 }
 
-FEdge* SVertex::getFEdge(Interface0D& inter)
+#if 0
+float FEdge::viewedge_length() const
 {
-  FEdge * result = 0;
-  SVertex* iVertexB = dynamic_cast<SVertex*>(&inter);
-  if (!iVertexB)
-    return result;
-  vector<FEdge*>::const_iterator fe=_FEdges.begin(), feend=_FEdges.end();
-  for(;
-  fe!=feend;
-  ++fe)
-  {
-    if(  (((*fe)->vertexA() == this) && ((*fe)->vertexB() == iVertexB))
-      || (((*fe)->vertexB() == this) && ((*fe)->vertexA() == iVertexB)))
-      result = (*fe);
-  }
-  if((result == 0) && (getNature() & Nature::T_VERTEX))
-  {
-    SVertex *brother;
-    ViewVertex *vvertex = viewvertex();
-    TVertex * tvertex = dynamic_cast<TVertex*>(vvertex);
-    if(tvertex)
-    {
-      brother = tvertex->frontSVertex();
-      if(this == brother)
-        brother = tvertex->backSVertex();
-      const vector<FEdge*>& fedges = brother->fedges();
-      for(fe=fedges.begin(),feend=fedges.end();
-      fe!=feend;
-      ++fe)
-      {
-        if(  (((*fe)->vertexA() == brother) && ((*fe)->vertexB() == iVertexB))
-          || (((*fe)->vertexB() == brother) && ((*fe)->vertexA() == iVertexB)))
-        result = (*fe);
-      }
-    }
-  }
-  if((result == 0) && (iVertexB->getNature() & Nature::T_VERTEX))
-  {
-    SVertex *brother;
-    ViewVertex *vvertex = iVertexB->viewvertex();
-    TVertex * tvertex = dynamic_cast<TVertex*>(vvertex);
-    if(tvertex)
-    {
-      brother = tvertex->frontSVertex();
-      if(iVertexB == brother)
-        brother = tvertex->backSVertex();
-      for(fe=_FEdges.begin(),feend=_FEdges.end();
-      fe!=feend;
-      ++fe)
-      {
-        if(  (((*fe)->vertexA() == this) && ((*fe)->vertexB() == brother))
-          || (((*fe)->vertexB() == this) && ((*fe)->vertexA() == brother)))
-        result = (*fe);
-      }
-    }
-  }
-  
-  return result;
-}
-
-
-                  /**********************************/
-                  /*                                */
-                  /*                                */
-                  /*             FEdge              */
-                  /*                                */
-                  /*                                */
-                  /**********************************/
-
-
-int FEdge::viewedge_nature() const {return _ViewEdge->getNature();}
-//float FEdge::viewedge_length() const {return _ViewEdge->viewedge_length();}
-const SShape* FEdge::occluded_shape() const 
-{
-  ViewShape * aShape = _ViewEdge->aShape(); 
-  if(aShape == 0) 
-    return 0;
-  return aShape->sshape();
-}
-
-float FEdge::shape_importance() const 
-{
-  return _VertexA->shape()->importance();
-} 
-
-int FEdge::invisibility() const 
-{
-  return _ViewEdge->qi();
-}
-
-occluder_container::const_iterator FEdge::occluders_begin() const {return _ViewEdge->occluders_begin();}
-occluder_container::const_iterator FEdge::occluders_end() const {return _ViewEdge->occluders_end();}
-bool FEdge::occluders_empty() const {return _ViewEdge->occluders_empty();}
-int FEdge::occluders_size() const {return _ViewEdge->occluders_size();}
+	return _ViewEdge->viewedge_length();
+}
+#endif
+
+const SShape *FEdge::occluded_shape() const
+{
+	ViewShape *aShape = _ViewEdge->aShape();
+	if (aShape == 0)
+		return 0;
+	return aShape->sshape();
+}
+
+float FEdge::shape_importance() const
+{
+	return _VertexA->shape()->importance();
+}
+
+int FEdge::invisibility() const
+{
+	return _ViewEdge->qi();
+}
+
+occluder_container::const_iterator FEdge::occluders_begin() const
+{
+	return _ViewEdge->occluders_begin();
+}
+
+occluder_container::const_iterator FEdge::occluders_end() const
+{
+	return _ViewEdge->occluders_end();
+}
+
+bool FEdge::occluders_empty() const
+{
+	return _ViewEdge->occluders_empty();
+}
+
+int FEdge::occluders_size() const
+{
+	return _ViewEdge->occluders_size();
+}
+
 const bool  FEdge::occludee_empty() const
 {
-  return _ViewEdge->occludee_empty();
-}
-
-
-
-Id FEdge::shape_id() const 
-{
-  return _VertexA->shape()->getId();
-}
-const SShape* FEdge::shape() const 
-{
-  return _VertexA->shape();
-}
-
-real FEdge::z_discontinuity() const 
-{
-  if(!(getNature() & Nature::SILHOUETTE) && !(getNature() & Nature::BORDER))
-  {
-    return 0;
-  }
-
-  BBox<Vec3r> box = ViewMap::getInstance()->getScene3dBBox();
-
-  Vec3r bbox_size_vec(box.getMax() - box.getMin());
-  real bboxsize = bbox_size_vec.norm();
-  if(occludee_empty())
-
-  {
-    //return FLT_MAX;
-
-    return 1.0;
-
-    //return bboxsize;
-
-  }
-  //  real result;
-  //  z_discontinuity_functor<SVertex> _functor;
-
-  //  Evaluate<SVertex,z_discontinuity_functor<SVertex> >(&_functor, iCombination, result )
-  Vec3r middle((_VertexB->point3d()-_VertexA->point3d()));
-
-  middle /= 2;
-  Vec3r disc_vec(middle - _occludeeIntersection);
-  real res = disc_vec.norm() / bboxsize;
-  return res;
-  
-  //return fabs((middle.z()-_occludeeIntersection.z()));
-}
-
-
-//float FEdge::local_average_depth(int iCombination ) const 
-//{
-//
-//  float result;
-//  local_average_depth_functor<SVertex> functor;
-//  Evaluate(&functor, iCombination, result);
-//
-//  return result;
-//}
-//float FEdge::local_depth_variance(int iCombination ) const
-//{
-//  float result;
-//
-//  local_depth_variance_functor<SVertex> functor;
-//
-//  Evaluate(&functor, iCombination, result);
-//
-//  return result;
-//}
-//
-//
-//real FEdge::local_average_density( float sigma, int iCombination) const 
-//{
-//  float result;
-//
-//  density_functor<SVertex> functor(sigma);
-//
-//  Evaluate(&functor, iCombination, result);
-//
-//  return result;
-//}
-//
-////Vec3r FEdge::normal(int& oException /* = Exception::NO_EXCEPTION */)
-////{
-////  Vec3r Na = _VertexA->normal(oException);
-////  if(oException != Exception::NO_EXCEPTION)
-////    return Na;
-////  Vec3r Nb = _VertexB->normal(oException);
-////  if(oException != Exception::NO_EXCEPTION)
-////    return Nb;
-////  return (Na+Nb)/2.0;
-////}  
-//
-//Vec3r FEdge::curvature2d_as_vector(int iCombination) const 
-//{
-//  Vec3r result;
-//  curvature2d_as_vector_functor<SVertex> _functor;
-//  Evaluate<Vec3r,curvature2d_as_vector_functor<SVertex> >(&_functor, iCombination, result );
-//  return result;
-//}
-//
-//real FEdge::curvature2d_as_angle(int iCombination) const 
-//{
-//  real result;
-//  curvature2d_as_angle_functor<SVertex> _functor;
-//  Evaluate<real,curvature2d_as_angle_functor<SVertex> >(&_functor, iCombination, result );
-//  return result;
-//}
-
-                  /**********************************/
-                  /*                                */
-                  /*                                */
-                  /*             FEdgeSharp        */
-                  /*                                */
-                  /*                                */
-                  /**********************************/
-
-//Material FEdge::material() const 
-//{
-//  return _VertexA->shape()->material();
-//}
-const FrsMaterial& FEdgeSharp::aFrsMaterial() const {
-  return _VertexA->shape()->frs_material(_aFrsMaterialIndex);
-}
-
-const FrsMaterial& FEdgeSharp::bFrsMaterial() const {
-  return _VertexA->shape()->frs_material(_bFrsMaterialIndex);
-}
-
-                 /**********************************/
-                  /*                                */
-                  /*                                */
-                  /*             FEdgeSmooth         */
-                  /*                                */
-                  /*                                */
-                  /**********************************/
-
-const FrsMaterial& FEdgeSmooth::frs_material() const {
-  return _VertexA->shape()->frs_material(_FrsMaterialIndex);
+	return _ViewEdge->occludee_empty();
+}
+
+Id FEdge::shape_id() const
+{
+	return _VertexA->shape()->getId();
+}
+
+const SShape *FEdge::shape() const
+{
+	return _VertexA->shape();
+}
+
+real FEdge::z_discontinuity() const
+{
+	if (!(getNature() & Nature::SILHOUETTE) && !(getNature() & Nature::BORDER)) {
+		return 0;
+	}
+
+	BBox<Vec3r> box = ViewMap::getInstance()->getScene3dBBox();
+
+	Vec3r bbox_size_vec(box.getMax() - box.getMin());
+	real bboxsize = bbox_size_vec.norm();
+	if (occludee_empty()) {
+		//return FLT_MAX;
+		return 1.0;
+		//return bboxsize;
+	}
+
+#if 0
+	real result;
+	z_discontinuity_functor<SVertex> _functor;
+	Evaluate<SVertex, z_discontinuity_functor<SVertex> >(&_functor, iCombination, result);
+#endif
+	Vec3r middle((_VertexB->point3d() - _VertexA->point3d()));
+	middle /= 2;
+	Vec3r disc_vec(middle - _occludeeIntersection);
+	real res = disc_vec.norm() / bboxsize;
+
+	return res;
+	//return fabs((middle.z() - _occludeeIntersection.z()));
+}
+
+#if 0
+float FEdge::local_average_depth(int iCombination ) const
+{
+	float result;
+	local_average_depth_functor<SVertex> functor;
+	Evaluate(&functor, iCombination, result);
+
+	return result;
+}
+
+float FEdge::local_depth_variance(int iCombination ) const
+{
+	float result;
+
+	local_depth_variance_functor<SVertex> functor;
+
+	Evaluate(&functor, iCombination, result);
+
+	return result;
+}
+
+real FEdge::local_average_density( float sigma, int iCombination) const
+{
+	float result;
+
+	density_functor<SVertex> functor(sigma);
+
+	Evaluate(&functor, iCombination, result);
+
+	return result;
+}
+
+Vec3r FEdge::normal(int& oException /* = Exception::NO_EXCEPTION */)
+{
+	Vec3r Na = _VertexA->normal(oException);
+	if (oException != Exception::NO_EXCEPTION)
+		return Na;
+	Vec3r Nb = _VertexB->normal(oException);
+	if (oException != Exception::NO_EXCEPTION)
+		return Nb;
+	return (Na + Nb) / 2.0;
+}
+
+Vec3r FEdge::curvature2d_as_vector(int iCombination) const
+{
+	Vec3r result;
+	curvature2d_as_vector_functor<SVertex> _functor;
+	Evaluate<Vec3r, curvature2d_as_vector_functor<SVertex> >(&_functor, iCombination, result);
+	return result;
+}
+
+real FEdge::curvature2d_as_angle(int iCombination) const
+{
+	real result;
+	curvature2d_as_angle_functor<SVertex> _functor;
+	Evaluate<real, curvature2d_as_angle_functor<SVertex> >(&_functor, iCombination, result);
+	return result;
+}
+#endif
+
+/**********************************/
+/*                                */
+/*                                */
+/*            FEdgeSharp          */
+/*                                */
+/*                                */
+/**********************************/
+
+#if 0
+Material FEdge::material() const
+{
+	return _VertexA->shape()->material();
+}
+#endif
+
+const FrsMaterial& FEdgeSharp::aFrsMaterial() const
+{
+	return _VertexA->shape()->frs_material(_aFrsMaterialIndex);
+}
+
+const FrsMaterial& FEdgeSharp::bFrsMaterial() const
+{
+	return _VertexA->shape()->frs_material(_bFrsMaterialIndex);
+}
+
+/**********************************/
+/*                                */
+/*                                */
+/*            FEdgeSmooth         */
+/*                                */
+/*                                */
+/**********************************/
+
+const FrsMaterial& FEdgeSmooth::frs_material() const
+{
+	return _VertexA->shape()->frs_material(_FrsMaterialIndex);
 }