diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
18 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h index 48d5cd4803e..87f132b1ff3 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h @@ -109,7 +109,7 @@ private: int _level; public: - /*! Builds the functor from name of the + /*! Builds the functor from name of the * Map that must be read. * \param iMapName * The name of the map. @@ -171,7 +171,7 @@ private: int _level; public: - /*! Builds the functor + /*! Builds the functor * \param level * The level of the pyramid from which the pixel must be read. */ @@ -199,7 +199,7 @@ private: float _step; public: - /*! Builds the functor + /*! Builds the functor * \param level * The level of the pyramid from which the pixel must be read. */ diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp index ed527080f36..247217791a5 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp @@ -114,7 +114,7 @@ int GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter) //soc unsigned size; result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); return 0; -} +} int GetCompleteViewMapDensityF1D::operator()(Interface1D& inter) { diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index 9df690cf5b0..ec698ca5e68 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -135,7 +135,7 @@ class GetCompleteViewMapDensityF1D : public UnaryFunction1D<double> public: /*! Builds the functor. * \param level - * The level of the pyramid from which + * The level of the pyramid from which * the pixel must be read. * \param iType * The integration method used to compute diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index a9ef49aa802..5ba96f31272 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -61,7 +61,7 @@ public: protected: real _maxThickness; real _minThickness; - Vec2f _orientation; + Vec2f _orientation; bool _clamp; }; diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index cc935a7e311..d3d19beba95 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -405,7 +405,7 @@ public: class BackboneStretcherShader : public StrokeShader { private: - float _amount; + float _amount; public: /*! Builds the shader. @@ -524,7 +524,7 @@ public: * The smaller, the closer the new stroke to the orinal one. * This error corresponds to the maximum distance between the new stroke and the old one. */ - PolygonalizationShader(float iError) : StrokeShader() + PolygonalizationShader(float iError) : StrokeShader() { _error = iError; } @@ -594,7 +594,7 @@ public: virtual int shade(Stroke &stroke) const; protected: - real _tipLength; + real _tipLength; }; /*! [ Texture Shader ]. diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 5919344b6e0..6d84ff995d2 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -128,7 +128,7 @@ public: void Clear(); /* Erases the layers */ - virtual void Erase(); + virtual void Erase(); /* Reads a pixel area from the canvas */ virtual void readColorPixels(int x, int y, int w, int h, RGBImage& oImage) const = 0; diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 4ece24c5ecf..310409f160f 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -80,7 +80,7 @@ public: { _internalIterator = iBrother._internalIterator; _restrictToSelection = iBrother._restrictToSelection; - _restrictToUnvisited = iBrother._restrictToUnvisited; + _restrictToUnvisited = iBrother._restrictToUnvisited; return *this; } @@ -289,7 +289,7 @@ public: */ virtual int traverse(const AdjacencyIterator& it); - /*! Inits the iterator context */ + /*! Inits the iterator context */ virtual int init() { return 0; diff --git a/source/blender/freestyle/intern/stroke/ContextFunctions.h b/source/blender/freestyle/intern/stroke/ContextFunctions.h index d8b780e77a0..97710437e47 100644 --- a/source/blender/freestyle/intern/stroke/ContextFunctions.h +++ b/source/blender/freestyle/intern/stroke/ContextFunctions.h @@ -64,7 +64,7 @@ BBox<Vec2i> GetBorderCF(); void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels = 4, float iSigma = 1.0f); // ReadMapPixel -/*! Reads a pixel in a user-defined map +/*! Reads a pixel in a user-defined map * \return the floating value stored for that pixel * \param iMapName * The name of the map diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index a8dbce84971..52fd780ee43 100644 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -317,7 +317,7 @@ float CurvePoint::shape_importance() const if (__A == 0) return __B->shape_importance(); return __A->shape_importance(); -} +} const unsigned CurvePoint::qi() const diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 726b238c74b..04cc2fbfd39 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -94,7 +94,7 @@ public: // Implementation of Interface0D return _Point3d.z(); } - /*! Returns the 3D point. */ + /*! Returns the 3D point. */ virtual Vec3r getPoint3D() const { return _Point3d; @@ -118,7 +118,7 @@ public: // Implementation of Interface0D return _Point2d.z(); } - /*! Returns the 2D point. */ + /*! Returns the 2D point. */ virtual Vec2r getPoint2D() const { return Vec2r(_Point2d.x(), _Point2d.y()); @@ -444,7 +444,7 @@ public: } /*! Adds a single vertex (SVertex) at the end of the Curve */ - inline void push_vertex_back(SVertex *iVertex) + inline void push_vertex_back(SVertex *iVertex) { if (!_Vertices.empty()) { Vec3r vec_tmp(iVertex->point2d() - _Vertices.back()->point2d()); @@ -456,7 +456,7 @@ public: } /*! Adds a single vertex (CurvePoint) at the front of the Curve */ - inline void push_vertex_front(Vertex *iVertex) + inline void push_vertex_front(Vertex *iVertex) { if (!_Vertices.empty()) { Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d()); @@ -468,7 +468,7 @@ public: } /*! Adds a single vertex (SVertex) at the front of the Curve */ - inline void push_vertex_front(SVertex *iVertex) + inline void push_vertex_front(SVertex *iVertex) { if (!_Vertices.empty()) { Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d()); diff --git a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index 4142117c361..726c80d889c 100644 --- a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h @@ -39,7 +39,7 @@ class CurvePoint_const_traits : public Const_traits<CurvePoint*> public: typedef deque<CurvePoint*> vertex_container; typedef vertex_container::const_iterator vertex_container_iterator; - typedef SVertex vertex_type; + typedef SVertex vertex_type; }; class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint*> @@ -47,7 +47,7 @@ class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint*> public: typedef deque<CurvePoint*> vertex_container; typedef vertex_container::iterator vertex_container_iterator; - typedef SVertex vertex_type; + typedef SVertex vertex_type; }; /**********************************/ @@ -325,7 +325,7 @@ protected: } } - virtual void decrement() + virtual void decrement() { if (_Point != 0) { delete _Point; diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index d7a79d6e788..cb33221cfd4 100644 --- a/source/blender/freestyle/intern/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h @@ -35,13 +35,13 @@ namespace Freestyle { namespace CurveInternal { -/*! iterator on a curve. Allows an iterating outside +/*! iterator on a curve. Allows an iterating outside * initial vertices. A CurvePoint is instanciated an returned * when the iterator is dereferenced. */ class CurvePointIterator : public Interface0DIteratorNested -{ +{ public: friend class Freestyle::Curve; diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index dfb50d903f7..151cd29ca07 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -704,7 +704,7 @@ static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryP if (newId == 0) { newId = new Id(_curve->getId()); _curve->setSplittingId(newId); - } + } Chain *new_curve_a = new Chain(*newId); newId->setSecond(newId->getSecond() + 1); @@ -791,9 +791,9 @@ int Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& p if (!splitted_chains.empty()) { for (cit = splitted_chains.begin(), citend = splitted_chains.end(); cit != citend; ++cit) { delete (*cit); - } + } splitted_chains.clear(); - } + } _current_chains_set.clear(); #if 0 @@ -1036,7 +1036,7 @@ static Stroke *createStroke(Interface1D& inter) Vec2r previous = current; SVertex *sv; CurvePoint *cp; - StrokeVertex *stroke_vertex = NULL; + StrokeVertex *stroke_vertex = NULL; bool hasSingularity = false; do { diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index c7b0e3f8b81..4130f9b370e 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -94,7 +94,7 @@ public: * \param pred * The predicate on the ViewEdge that expresses the stopping condition. */ - static int chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred); + static int chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred); /*! Builds a set of chains from the current set of ViewEdges. * Each ViewEdge of the current list potentially starts a new chain. The chaining operator then iterates over diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index db96a27e073..60b8c21067f 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -565,7 +565,7 @@ public: * \param iBegin * The iterator pointing to the first vertex. * \param iEnd - * The iterator pointing to the end of the vertex list. + * The iterator pointing to the end of the vertex list. */ template<class InputVertexIterator> Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd); @@ -601,7 +601,7 @@ public: * Resamples the curve with a given sampling. * If this sampling is < to the actual sampling value, no resampling is done. * \param iSampling - * The new sampling value. + * The new sampling value. */ int Resample(float iSampling); @@ -609,7 +609,7 @@ public: */ void RemoveAllVertices(); - /*! Removes the stroke vertex iVertex + /*! Removes the stroke vertex iVertex * from the stroke. * The length and curvilinear abscissa are updated * consequently. diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 868f61224de..054182a558a 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -112,7 +112,7 @@ protected: static string _patterns_path; static string _brushes_path; unsigned int _defaultTextureId; - + #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager") #endif diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 028127897ff..81ef46e5b3b 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -741,7 +741,7 @@ StrokeRep::StrokeRep(Stroke *iStroke) #if 0 _averageTextureAlpha = 0.5; //default value if (_strokeType == OIL_STROKE) - _averageTextureAlpha = 0.75; + _averageTextureAlpha = 0.75; if (_strokeType >= NO_BLEND_STROKE) _averageTextureAlpha = 1.0; #endif diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index 02f7177b95c..dd0b945e4d3 100644 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -28,7 +28,7 @@ // Purpose : Class to define the text rendering of a stroke // Format: // x y width height // bbox -// //list of vertices : +// //list of vertices : // t x y z t1 t2 r g b alpha ... // ... // Date of creation : 01/14/2005 |