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 | |
parent | e43d482cc93c64d55b1f58178db68551077e6560 (diff) |
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
Diffstat (limited to 'source/blender/freestyle/intern')
17 files changed, 33 insertions, 34 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index dea09b7620f..4628c76ca7f 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -835,9 +835,9 @@ bool Controller::getFaceSmoothness() const return _EnableFaceSmoothness; } -void Controller::setComputeRidgesAndValleysFlag(bool iBool) +void Controller::setComputeRidgesAndValleysFlag(bool b) { - _ComputeRidges = iBool; + _ComputeRidges = b; } bool Controller::getComputeRidgesAndValleysFlag() const diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index 46cd307d9af..62d57f01264 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h @@ -247,7 +247,7 @@ void fromImageToRetina(const Vec3r &p, Vec3r &q, const int viewport[4]); * The projection matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -void fromRetinaToCamera(const Vec3r &p, Vec3r &q, real z, const real projection_matrix[4][4]); +void fromRetinaToCamera(const Vec3r &p, Vec3r &q, real focal, const real projection_matrix[4][4]); /*! Projects from camera coordinates to world coordinates * Returns the point's coordinates expressed in the world's diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index b66f04398af..d0d92b62516 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -287,7 +287,7 @@ class Grid { * This method is quite coarse insofar as it adds all cells intersecting the polygon bounding * box convex_poly The list of 3D points constituting a convex polygon */ - void insertOccluder(Polygon3r *convex_poly); + void insertOccluder(Polygon3r *occluder); /*! Adds an occluder to the list of occluders */ void addOccluder(Polygon3r *occluder) 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); } } diff --git a/source/blender/freestyle/intern/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h index e514f4cfc9f..f54a0035b62 100644 --- a/source/blender/freestyle/intern/system/RandGen.h +++ b/source/blender/freestyle/intern/system/RandGen.h @@ -34,7 +34,7 @@ namespace Freestyle { class RandGen { public: static real drand48(); - static void srand48(long value); + static void srand48(long seedval); private: static void next(); diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index c4115ee00c4..2373451f47c 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -73,17 +73,17 @@ class FEdgeXDetector { virtual void processShapes(WingedEdge &); // GENERAL STUFF - virtual void preProcessShape(WXShape *iShape); + virtual void preProcessShape(WXShape *iWShape); virtual void preProcessFace(WXFace *iFace); virtual void computeCurvatures(WXVertex *iVertex); // SILHOUETTE - virtual void processSilhouetteShape(WXShape *iShape); + virtual void processSilhouetteShape(WXShape *iWShape); virtual void ProcessSilhouetteFace(WXFace *iFace); virtual void ProcessSilhouetteEdge(WXEdge *iEdge); // CREASE - virtual void processCreaseShape(WXShape *iShape); + virtual void processCreaseShape(WXShape *iWShape); virtual void ProcessCreaseEdge(WXEdge *iEdge); /*! Sets the minimum angle for detecting crease edges @@ -109,15 +109,15 @@ class FEdgeXDetector { } // BORDER - virtual void processBorderShape(WXShape *iShape); + virtual void processBorderShape(WXShape *iWShape); virtual void ProcessBorderEdge(WXEdge *iEdge); // RIDGES AND VALLEYS - virtual void processRidgesAndValleysShape(WXShape *iShape); + virtual void processRidgesAndValleysShape(WXShape *iWShape); virtual void ProcessRidgeFace(WXFace *iFace); // SUGGESTIVE CONTOURS - virtual void processSuggestiveContourShape(WXShape *iShape); + virtual void processSuggestiveContourShape(WXShape *iWShape); virtual void ProcessSuggestiveContourFace(WXFace *iFace); virtual void postProcessSuggestiveContourShape(WXShape *iShape); virtual void postProcessSuggestiveContourFace(WXFace *iFace); diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index 7549ebcb258..7790dd64cf5 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -146,9 +146,8 @@ double *SteerableViewMap::AddFEdge(FEdge *iFEdge) return res; } -unsigned SteerableViewMap::getSVMNumber(const Vec2f &orient) +unsigned SteerableViewMap::getSVMNumber(Vec2f dir) { - Vec2f dir(orient); // soc unsigned res = 0; real norm = dir.norm(); if (norm < 1.0e-6) { diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index 65633fd85d4..e03400dbbc0 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h @@ -78,7 +78,7 @@ class SteerableViewMap { * \param dir: * The direction */ - unsigned getSVMNumber(const Vec2f &dir); + unsigned getSVMNumber(Vec2f dir); /*! Returns the number of the SVM to which a FEdge belongs most. * \param id: diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index f6f54a2d87d..1fce4f4a965 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h @@ -264,7 +264,7 @@ class ViewEdgeXBuilder { // SHARP // /*! checks whether a WEdge has already been processed or not */ - bool stopSharpViewEdge(WXEdge *iFace); + bool stopSharpViewEdge(WXEdge *iEdge); int retrieveFaceMarks(WXEdge *iEdge); OWXEdge FindNextWEdge(const OWXEdge &iEdge); OWXEdge FindPreviousWEdge(const OWXEdge &iEdge); diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index e5e49f17ca5..1c959c43481 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -153,7 +153,7 @@ class ViewMap { return _VEdges.size(); } - ViewShape *viewShape(unsigned index); + ViewShape *viewShape(unsigned id); id_to_index_map &shapeIdToIndexMap() { diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp index 54de3321b80..a1f76c120fb 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp @@ -33,7 +33,7 @@ NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap) return Tesselate(viewedges.begin(), viewedges.end()); } -NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(shape)) +NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(iWShape)) { return NULL; } diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h index 9ecc92df2ac..d73674d02cd 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.h +++ b/source/blender/freestyle/intern/winged_edge/Curvature.h @@ -122,7 +122,7 @@ class Face_Curvature_Info { #endif }; -bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &n); +bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh); bool gts_vertex_gaussian_curvature(WVertex *v, real *Kg); |