diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-04 21:59:13 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-04 22:04:16 +0300 |
commit | 2115232a16d81d28dbdb8042ed8e9316858514c6 (patch) | |
tree | 1aeb7354a85b21b43a3ede7bf2980c172d4eec82 /source/blender/freestyle/intern/stroke | |
parent | e43d482cc93c64d55b1f58178db68551077e6560 (diff) |
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
6 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp index 96375407256..abe3871c395 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp @@ -89,10 +89,10 @@ int CalligraphicShader::shade(Stroke &ioStroke) const static const unsigned NB_VALUE_NOISE = 512; SpatialNoiseShader::SpatialNoiseShader( - float ioamount, float ixScale, int nbOctave, bool smooth, bool pureRandom) + float iAmount, float ixScale, int nbOctave, bool smooth, bool pureRandom) : StrokeShader() { - _amount = ioamount; + _amount = iAmount; if (ixScale == 0) { _xScale = 0; } @@ -161,7 +161,7 @@ int SpatialNoiseShader::shade(Stroke &ioStroke) const // ///////////////////////////////////////// -SmoothingShader::SmoothingShader(int ionbIteration, +SmoothingShader::SmoothingShader(int iNbIteration, real iFactorPoint, real ifactorCurvature, real iFactorCurvatureDifference, @@ -171,7 +171,7 @@ SmoothingShader::SmoothingShader(int ionbIteration, real iCarricatureFactor) : StrokeShader() { - _nbIterations = ionbIteration; + _nbIterations = iNbIteration; _factorCurvature = ifactorCurvature; _factorCurvatureDifference = iFactorCurvatureDifference; _anisoNormal = iAnisoNormal; diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 2bbd9c2682f..91676946b5d 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -243,7 +243,7 @@ class Canvas { void resetModified(bool iMod = false); void causalStyleModules(std::vector<unsigned> &vec, unsigned index = 0); - void setModified(unsigned index, bool b); + void setModified(unsigned index, bool iMod); #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Canvas") diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 518f4ff345b..91470b57ca2 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -212,20 +212,20 @@ class CurvePoint : public Interface0D { * The first SVertex * \param iB: * The second SVertex - * \param t2d: + * \param t: * A 2D interpolation parameter used to linearly interpolate \a iA and \a iB */ - CurvePoint(SVertex *iA, SVertex *iB, float t2d); + CurvePoint(SVertex *iA, SVertex *iB, float t); /*! Builds a CurvePoint from two CurvePoint and an interpolation parameter. * \param iA: * The first CurvePoint * \param iB: * The second CurvePoint - * \param t2d: + * \param t: * The 2D interpolation parameter used to linearly interpolate \a iA and \a iB. */ - CurvePoint(CurvePoint *iA, CurvePoint *iB, float t2d); + CurvePoint(CurvePoint *iA, CurvePoint *iB, float t); // CurvePoint(SVertex *iA, SVertex *iB, float t2d, float t3d); diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 71753b25328..5772b80b093 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -835,7 +835,7 @@ class Stroke : public Interface1D { // embedding vertex iterator const_vertex_iterator vertices_begin() const; - vertex_iterator vertices_begin(float t = 0.0f); + vertex_iterator vertices_begin(float sampling = 0.0f); const_vertex_iterator vertices_end() const; vertex_iterator vertices_end(); diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp index a29d015b4c9..5b2beb8f068 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp @@ -89,12 +89,12 @@ void TextureManager::load() _hasLoadedTextures = true; } -unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType loadingMode) +unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType iType) { - BrushTexture bt(name, loadingMode); + BrushTexture bt(name, iType); brushesMap::iterator b = _brushesMap.find(bt); if (b == _brushesMap.end()) { - unsigned texId = loadBrush(name, loadingMode); + unsigned texId = loadBrush(name, iType); _brushesMap[bt] = texId; return texId; // XXX! diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index fe12727b0c0..0c004e0083e 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -52,8 +52,8 @@ StrokeVertexRep::StrokeVertexRep(const StrokeVertexRep &iBrother) Strip::Strip(const vector<StrokeVertex *> &iStrokeVertices, bool hasTex, - bool beginTip, - bool endTip, + bool tipBegin, + bool tipEnd, float texStep) { createStrip(iStrokeVertices); @@ -63,7 +63,7 @@ Strip::Strip(const vector<StrokeVertex *> &iStrokeVertices, if (hasTex) { // We compute both kinds of coordinates to use different kinds of textures computeTexCoord(iStrokeVertices, texStep); - computeTexCoordWithTips(iStrokeVertices, beginTip, endTip, texStep); + computeTexCoordWithTips(iStrokeVertices, tipBegin, tipEnd, texStep); } } |