diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/view_map/Interface1D.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/view_map/Interface1D.h')
-rw-r--r-- | source/blender/freestyle/intern/view_map/Interface1D.h | 245 |
1 files changed, 123 insertions, 122 deletions
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h index de190f22e2d..e56a58096f8 100644 --- a/source/blender/freestyle/intern/view_map/Interface1D.h +++ b/source/blender/freestyle/intern/view_map/Interface1D.h @@ -34,7 +34,7 @@ #include "../winged_edge/Nature.h" #ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif using namespace std; @@ -46,11 +46,11 @@ namespace Freestyle { * from each 0D element of a 1D element. */ typedef enum { - MEAN, /*!< The value computed for the 1D element is the mean of the values obtained for the 0D elements.*/ - MIN, /*!< The value computed for the 1D element is the minimum of the values obtained for the 0D elements.*/ - MAX, /*!< The value computed for the 1D element is the maximum of the values obtained for the 0D elements.*/ - FIRST, /*!< The value computed for the 1D element is the first of the values obtained for the 0D elements.*/ - LAST, /*!< The value computed for the 1D element is the last of the values obtained for the 0D elements.*/ + MEAN, /*!< The value computed for the 1D element is the mean of the values obtained for the 0D elements.*/ + MIN, /*!< The value computed for the 1D element is the minimum of the values obtained for the 0D elements.*/ + MAX, /*!< The value computed for the 1D element is the maximum of the values obtained for the 0D elements.*/ + FIRST, /*!< The value computed for the 1D element is the first of the values obtained for the 0D elements.*/ + LAST, /*!< The value computed for the 1D element is the last of the values obtained for the 0D elements.*/ } IntegrationType; /*! Returns a single value from a set of values evaluated at each 0D element of this 1D element. @@ -65,54 +65,56 @@ typedef enum { * The integration method used to compute a single value from a set of values. * \return the single value obtained for the 1D element. */ -template <class T> -T integrate(UnaryFunction0D<T>& fun, Interface0DIterator it, Interface0DIterator it_end, +template<class T> +T integrate(UnaryFunction0D<T> &fun, + Interface0DIterator it, + Interface0DIterator it_end, IntegrationType integration_type = MEAN) { - T res; - unsigned size; - switch (integration_type) { - case MIN: - fun(it); - res = fun.result; - ++it; - for (; !it.isEnd(); ++it) { - fun(it); - if (fun.result < res) - res = fun.result; - } - break; - case MAX: - fun(it); - res = fun.result; - ++it; - for (; !it.isEnd(); ++it) { - fun(it); - if (fun.result > res) - res = fun.result; - } - break; - case FIRST: - fun(it); - res = fun.result; - break; - case LAST: - fun(--it_end); - res = fun.result; - break; - case MEAN: - default: - fun(it); - res = fun.result; - ++it; - for (size = 1; !it.isEnd(); ++it, ++size) { - fun(it); - res += fun.result; - } - res /= (size ? size : 1); - break; - } - return res; + T res; + unsigned size; + switch (integration_type) { + case MIN: + fun(it); + res = fun.result; + ++it; + for (; !it.isEnd(); ++it) { + fun(it); + if (fun.result < res) + res = fun.result; + } + break; + case MAX: + fun(it); + res = fun.result; + ++it; + for (; !it.isEnd(); ++it) { + fun(it); + if (fun.result > res) + res = fun.result; + } + break; + case FIRST: + fun(it); + res = fun.result; + break; + case LAST: + fun(--it_end); + res = fun.result; + break; + case MEAN: + default: + fun(it); + res = fun.result; + ++it; + for (size = 1; !it.isEnd(); ++it, ++size) { + fun(it); + res += fun.result; + } + res /= (size ? size : 1); + break; + } + return res; } // @@ -121,80 +123,79 @@ T integrate(UnaryFunction0D<T>& fun, Interface0DIterator it, Interface0DIterator ////////////////////////////////////////////////// /*! Base class for any 1D element. */ -class Interface1D -{ -public: - /*! Default constructor */ - Interface1D() - { - _timeStamp = 0; - } - - /*! Destructor */ - virtual ~Interface1D() {}; - - /*! Returns the string "Interface1D". */ - virtual string getExactTypeName() const - { - return "Interface1D"; - } - - // Iterator access - - /*! Returns an iterator over the Interface1D vertices, pointing to the first vertex. */ - virtual Interface0DIterator verticesBegin(); - - /*! Returns an iterator over the Interface1D vertices, pointing after the last vertex. */ - virtual Interface0DIterator verticesEnd(); - - /*! Returns an iterator over the Interface1D points, pointing to the first point. The difference with - * verticesBegin() is that here we can iterate over points of the 1D element at a any given sampling. - * Indeed, for each iteration, a virtual point is created. - * \param t: - * The sampling with which we want to iterate over points of this 1D element. - */ - virtual Interface0DIterator pointsBegin(float t = 0.0f); - - /*! Returns an iterator over the Interface1D points, pointing after the last point. The difference with - * verticesEnd() is that here we can iterate over points of the 1D element at a any given sampling. - * Indeed, for each iteration, a virtual point is created. - * \param t: - * The sampling with which we want to iterate over points of this 1D element. - */ - virtual Interface0DIterator pointsEnd(float t = 0.0f); - - // Data access methods - - /*! Returns the 2D length of the 1D element. */ - virtual real getLength2D() const; - - /*! Returns the Id of the 1D element. */ - virtual Id getId() const; - - // FIXME: ce truc n'a rien a faire la...(c une requete complexe qui doit etre ds les Function1D) - /*! Returns the nature of the 1D element. */ - virtual Nature::EdgeNature getNature() const; - - /*! Returns the time stamp of the 1D element. Mainly used for selection. */ - virtual unsigned getTimeStamp() const - { - return _timeStamp; - } - - /*! Sets the time stamp for the 1D element. */ - inline void setTimeStamp(unsigned iTimeStamp) - { - _timeStamp = iTimeStamp; - } - -protected: - unsigned _timeStamp; +class Interface1D { + public: + /*! Default constructor */ + Interface1D() + { + _timeStamp = 0; + } + + /*! Destructor */ + virtual ~Interface1D(){}; + + /*! Returns the string "Interface1D". */ + virtual string getExactTypeName() const + { + return "Interface1D"; + } + + // Iterator access + + /*! Returns an iterator over the Interface1D vertices, pointing to the first vertex. */ + virtual Interface0DIterator verticesBegin(); + + /*! Returns an iterator over the Interface1D vertices, pointing after the last vertex. */ + virtual Interface0DIterator verticesEnd(); + + /*! Returns an iterator over the Interface1D points, pointing to the first point. The difference with + * verticesBegin() is that here we can iterate over points of the 1D element at a any given sampling. + * Indeed, for each iteration, a virtual point is created. + * \param t: + * The sampling with which we want to iterate over points of this 1D element. + */ + virtual Interface0DIterator pointsBegin(float t = 0.0f); + + /*! Returns an iterator over the Interface1D points, pointing after the last point. The difference with + * verticesEnd() is that here we can iterate over points of the 1D element at a any given sampling. + * Indeed, for each iteration, a virtual point is created. + * \param t: + * The sampling with which we want to iterate over points of this 1D element. + */ + virtual Interface0DIterator pointsEnd(float t = 0.0f); + + // Data access methods + + /*! Returns the 2D length of the 1D element. */ + virtual real getLength2D() const; + + /*! Returns the Id of the 1D element. */ + virtual Id getId() const; + + // FIXME: ce truc n'a rien a faire la...(c une requete complexe qui doit etre ds les Function1D) + /*! Returns the nature of the 1D element. */ + virtual Nature::EdgeNature getNature() const; + + /*! Returns the time stamp of the 1D element. Mainly used for selection. */ + virtual unsigned getTimeStamp() const + { + return _timeStamp; + } + + /*! Sets the time stamp for the 1D element. */ + inline void setTimeStamp(unsigned iTimeStamp) + { + _timeStamp = iTimeStamp; + } + + protected: + unsigned _timeStamp; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interface1D") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interface1D") #endif }; } /* namespace Freestyle */ -#endif // __FREESTYLE_INTERFACE_1D_H__ +#endif // __FREESTYLE_INTERFACE_1D_H__ |