From 190170d4cc92ff34abe1744a10474ac4f1074086 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Aug 2020 15:58:58 +0200 Subject: Cleanup: Clang-Tidy, readability-redundant-member-init --- .../freestyle/intern/application/AppCanvas.cpp | 4 +-- .../blender_interface/BlenderStrokeRenderer.cpp | 2 +- .../freestyle/intern/image/ImagePyramid.cpp | 2 -- .../intern/scene_graph/IndexedFaceSet.cpp | 3 +- .../freestyle/intern/scene_graph/NodeLight.cpp | 2 +- .../intern/stroke/AdvancedStrokeShaders.cpp | 3 -- .../freestyle/intern/stroke/BasicStrokeShaders.cpp | 10 +++---- .../freestyle/intern/stroke/BasicStrokeShaders.h | 34 +++++++++++----------- .../freestyle/intern/stroke/PSStrokeRenderer.cpp | 2 +- source/blender/freestyle/intern/stroke/Stroke.cpp | 2 +- .../freestyle/intern/stroke/TextStrokeRenderer.cpp | 2 +- .../blender/freestyle/intern/view_map/BoxGrid.cpp | 2 +- .../freestyle/intern/view_map/SphericalGrid.cpp | 2 +- .../freestyle/intern/view_map/ViewMapBuilder.cpp | 2 +- 14 files changed, 33 insertions(+), 39 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp index d34be79cd66..66e41222ee6 100644 --- a/source/blender/freestyle/intern/application/AppCanvas.cpp +++ b/source/blender/freestyle/intern/application/AppCanvas.cpp @@ -31,13 +31,13 @@ #include "../system/StringUtils.h" namespace Freestyle { -AppCanvas::AppCanvas() : Canvas() +AppCanvas::AppCanvas() { _pViewer = 0; _MapsPath = Config::Path::getInstance()->getMapsDir().c_str(); } -AppCanvas::AppCanvas(AppView *iViewer) : Canvas() +AppCanvas::AppCanvas(AppView *iViewer) { _pViewer = iViewer; } diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index f31d7c95997..2f465a973fc 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -70,7 +70,7 @@ namespace Freestyle { const char *BlenderStrokeRenderer::uvNames[] = {"along_stroke", "along_stroke_tips"}; -BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : StrokeRenderer() +BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) { freestyle_bmain = BKE_main_new(); diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp index 2f12081eb76..b6779669a15 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.cpp +++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp @@ -124,14 +124,12 @@ int ImagePyramid::height(int level) } GaussianPyramid::GaussianPyramid(const GrayImage &level0, unsigned nbLevels, float iSigma) - : ImagePyramid() { _sigma = iSigma; BuildPyramid(level0, nbLevels); } GaussianPyramid::GaussianPyramid(GrayImage *level0, unsigned nbLevels, float iSigma) - : ImagePyramid() { _sigma = iSigma; BuildPyramid(level0, nbLevels); diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp index fe0fc715e34..89c4bedd676 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp @@ -23,7 +23,7 @@ namespace Freestyle { -IndexedFaceSet::IndexedFaceSet() : Rep() +IndexedFaceSet::IndexedFaceSet() { _Vertices = NULL; _Normals = NULL; @@ -68,7 +68,6 @@ IndexedFaceSet::IndexedFaceSet(float *iVertices, unsigned *iTIndices, unsigned iTISize, unsigned iCopy) - : Rep() { if (1 == iCopy) { _VSize = iVSize; diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.cpp b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp index f6585d9f932..7200ae5e83c 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeLight.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp @@ -25,7 +25,7 @@ namespace Freestyle { int NodeLight::numberOfLights = 0; -NodeLight::NodeLight() : Node() +NodeLight::NodeLight() { if (numberOfLights > 7) { _number = 7; diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp index abe3871c395..7e2dcb8f99f 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp @@ -37,7 +37,6 @@ CalligraphicShader::CalligraphicShader(real iMinThickness, real iMaxThickness, const Vec2f &iOrientation, bool clamp) - : StrokeShader() { _minThickness = iMinThickness; _maxThickness = iMaxThickness; @@ -90,7 +89,6 @@ static const unsigned NB_VALUE_NOISE = 512; SpatialNoiseShader::SpatialNoiseShader( float iAmount, float ixScale, int nbOctave, bool smooth, bool pureRandom) - : StrokeShader() { _amount = iAmount; if (ixScale == 0) { @@ -169,7 +167,6 @@ SmoothingShader::SmoothingShader(int iNbIteration, real iAnisoNormal, real iAnisoCurvature, real iCarricatureFactor) - : StrokeShader() { _nbIterations = iNbIteration; _factorCurvature = ifactorCurvature; diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 36234ad619c..0d4f21d9b11 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -170,13 +170,13 @@ int LengthDependingThicknessShader::shade(Stroke &stroke) const static const unsigned NB_VALUE_NOISE = 512; -ThicknessNoiseShader::ThicknessNoiseShader() : StrokeShader() +ThicknessNoiseShader::ThicknessNoiseShader() { _amplitude = 1.0f; _scale = 1.0f / 2.0f / (float)NB_VALUE_NOISE; } -ThicknessNoiseShader::ThicknessNoiseShader(float iAmplitude, float iPeriod) : StrokeShader() +ThicknessNoiseShader::ThicknessNoiseShader(float iAmplitude, float iPeriod) { _amplitude = iAmplitude; _scale = 1.0f / iPeriod / (float)NB_VALUE_NOISE; @@ -256,13 +256,13 @@ int MaterialColorShader::shade(Stroke &stroke) const return 0; } -ColorNoiseShader::ColorNoiseShader() : StrokeShader() +ColorNoiseShader::ColorNoiseShader() { _amplitude = 1.0f; _scale = 1.0f / 2.0f / (float)NB_VALUE_NOISE; } -ColorNoiseShader::ColorNoiseShader(float iAmplitude, float iPeriod) : StrokeShader() +ColorNoiseShader::ColorNoiseShader(float iAmplitude, float iPeriod) { _amplitude = iAmplitude; _scale = 1.0f / iPeriod / (float)NB_VALUE_NOISE; @@ -646,7 +646,7 @@ int GuidingLinesShader::shade(Stroke &stroke) const // ///////////////////////////////////////// -TipRemoverShader::TipRemoverShader(real tipLength) : StrokeShader() +TipRemoverShader::TipRemoverShader(real tipLength) { _tipLength = tipLength; } diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index 8663cfd42bf..0ac0aa09cf9 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -56,7 +56,7 @@ class ConstantThicknessShader : public StrokeShader { * \param thickness: * The thickness that must be assigned to the stroke. */ - ConstantThicknessShader(float thickness) : StrokeShader() + ConstantThicknessShader(float thickness) { _thickness = thickness; } @@ -86,7 +86,7 @@ class ConstantThicknessShader : public StrokeShader { */ class ConstantExternThicknessShader : public StrokeShader { public: - ConstantExternThicknessShader(float thickness) : StrokeShader() + ConstantExternThicknessShader(float thickness) { _thickness = thickness; } @@ -120,7 +120,7 @@ class IncreasingThicknessShader : public StrokeShader { * \param iThicknessMax: * The second thickness value. */ - IncreasingThicknessShader(float iThicknessMin, float iThicknessMax) : StrokeShader() + IncreasingThicknessShader(float iThicknessMin, float iThicknessMax) { _ThicknessMin = iThicknessMin; _ThicknessMax = iThicknessMax; @@ -164,7 +164,7 @@ class ConstrainedIncreasingThicknessShader : public StrokeShader { * The ration thickness/length we don't want to exceed. */ ConstrainedIncreasingThicknessShader(float iThicknessMin, float iThicknessMax, float iRatio) - : StrokeShader() + { _ThicknessMin = iThicknessMin; _ThicknessMax = iThicknessMax; @@ -199,7 +199,7 @@ class LengthDependingThicknessShader : public StrokeShader { // l < 50 public: - LengthDependingThicknessShader(float iMinThickness, float iMaxThickness) : StrokeShader() + LengthDependingThicknessShader(float iMinThickness, float iMaxThickness) { _minThickness = iMinThickness; _maxThickness = iMaxThickness; @@ -265,7 +265,7 @@ class ConstantColorShader : public StrokeShader { * \param iAlpha: * The alpha value */ - ConstantColorShader(float iR, float iG, float iB, float iAlpha = 1.0f) : StrokeShader() + ConstantColorShader(float iR, float iG, float iB, float iAlpha = 1.0f) { _color[0] = iR; _color[1] = iG; @@ -322,7 +322,7 @@ class IncreasingColorShader : public StrokeShader { float iGM, float iBM, float iAlphaM) - : StrokeShader() + { _colorMin[0] = iRm; _colorMin[1] = iGm; @@ -353,7 +353,7 @@ class MaterialColorShader : public StrokeShader { float _coefficient; public: - MaterialColorShader(float coeff = 1.0f) : StrokeShader() + MaterialColorShader(float coeff = 1.0f) { _coefficient = coeff; } @@ -411,7 +411,7 @@ class BackboneStretcherShader : public StrokeShader { * \param iAmount: * The stretching amount value. */ - BackboneStretcherShader(float iAmount = 2.0f) : StrokeShader() + BackboneStretcherShader(float iAmount = 2.0f) { _amount = iAmount; } @@ -438,7 +438,7 @@ class SamplingShader : public StrokeShader { * \param sampling: * The sampling to use for the stroke resampling */ - SamplingShader(float sampling) : StrokeShader() + SamplingShader(float sampling) { _sampling = sampling; } @@ -457,7 +457,7 @@ class ExternalContourStretcherShader : public StrokeShader { float _amount; public: - ExternalContourStretcherShader(float iAmount = 2.0f) : StrokeShader() + ExternalContourStretcherShader(float iAmount = 2.0f) { _amount = iAmount; } @@ -486,7 +486,7 @@ class BezierCurveShader : public StrokeShader { * The error we're allowing for the approximation. * This error is the max distance allowed between the new curve and the original geometry. */ - BezierCurveShader(float error = 4.0) : StrokeShader() + BezierCurveShader(float error = 4.0) { _error = error; } @@ -517,7 +517,7 @@ class PolygonalizationShader : public StrokeShader { * geometry. The smaller, the closer the new stroke to the original one. * This error corresponds * to the maximum distance between the new stroke and the old one. */ - PolygonalizationShader(float iError) : StrokeShader() + PolygonalizationShader(float iError) { _error = iError; } @@ -548,7 +548,7 @@ class GuidingLinesShader : public StrokeShader { * "bbox". iOffset is the value of the displacement which is applied to this line along its * normal. */ - GuidingLinesShader(float iOffset) : StrokeShader() + GuidingLinesShader(float iOffset) { _offset = iOffset; } @@ -604,7 +604,7 @@ class BlenderTextureShader : public StrokeShader { * \param mtex: * The blender texture to use. */ - BlenderTextureShader(MTex *mtex) : StrokeShader() + BlenderTextureShader(MTex *mtex) { _mtex = mtex; _nodeTree = NULL; @@ -614,7 +614,7 @@ class BlenderTextureShader : public StrokeShader { * \param nodetree: * A node tree (of new shading nodes) to define textures. */ - BlenderTextureShader(bNodeTree *nodetree) : StrokeShader() + BlenderTextureShader(bNodeTree *nodetree) { _nodeTree = nodetree; _mtex = NULL; @@ -642,7 +642,7 @@ class StrokeTextureStepShader : public StrokeShader { * \param id: * The number of the preset to use. */ - StrokeTextureStepShader(float step) : StrokeShader() + StrokeTextureStepShader(float step) { _step = step; } diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp index c2c263696bc..0e3fea3ddf8 100644 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp @@ -24,7 +24,7 @@ namespace Freestyle { -PSStrokeRenderer::PSStrokeRenderer(const char *iFileName) : StrokeRenderer() +PSStrokeRenderer::PSStrokeRenderer(const char *iFileName) { if (!iFileName) { iFileName = "freestyle.ps"; diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index e74a676ec79..3e1463e8631 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -342,7 +342,7 @@ void StrokeAttribute::setAttributeVec3f(const char *iName, const Vec3f &att) /* */ /**********************************/ -StrokeVertex::StrokeVertex() : CurvePoint() +StrokeVertex::StrokeVertex() { _CurvilignAbscissa = 0.0f; _StrokeLength = 0.0f; diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp index f579bd72038..fa131743afc 100644 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp @@ -20,7 +20,7 @@ namespace Freestyle { -TextStrokeRenderer::TextStrokeRenderer(const char *iFileName) : StrokeRenderer() +TextStrokeRenderer::TextStrokeRenderer(const char *iFileName) { if (!iFileName) { iFileName = "freestyle.txt"; diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp index 5a490e3c7cc..aea54afc0f5 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp +++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp @@ -242,7 +242,7 @@ bool BoxGrid::enableQI() const return _enableQI; } -BoxGrid::Transform::Transform() : GridHelpers::Transform() +BoxGrid::Transform::Transform() { } diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp index 0c6e9741fbd..1399ac396b0 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp @@ -238,7 +238,7 @@ bool SphericalGrid::enableQI() const return _enableQI; } -SphericalGrid::Transform::Transform() : GridHelpers::Transform() +SphericalGrid::Transform::Transform() { } diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index a0989c52e4e..2ef01ce0874 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -2322,7 +2322,7 @@ struct less_Intersection { }; struct silhouette_binary_rule : public binary_rule { - silhouette_binary_rule() : binary_rule() + silhouette_binary_rule() { } -- cgit v1.2.3