diff options
Diffstat (limited to 'source/blender/freestyle')
33 files changed, 13 insertions, 151 deletions
diff --git a/source/blender/freestyle/intern/geometry/Bezier.cpp b/source/blender/freestyle/intern/geometry/Bezier.cpp index 4eec3d72db9..bf4a78b12c5 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.cpp +++ b/source/blender/freestyle/intern/geometry/Bezier.cpp @@ -26,13 +26,7 @@ using namespace std; namespace Freestyle { -BezierCurveSegment::BezierCurveSegment() -{ -} - -BezierCurveSegment::~BezierCurveSegment() -{ -} +BezierCurveSegment::~BezierCurveSegment() = default; void BezierCurveSegment::AddControlPoint(const Vec2d &iPoint) { diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index 4c6b38935f9..83b033c105a 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h @@ -41,7 +41,6 @@ class BezierCurveSegment { std::vector<Vec2d> _Vertices; public: - BezierCurveSegment(); virtual ~BezierCurveSegment(); void AddControlPoint(const Vec2d &iPoint); diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index 7c0b3bf0224..eb5a24f7373 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp @@ -462,10 +462,6 @@ static Vector2 V2SubII(Vector2 a, Vector2 b) //------------------------- WRAPPER -----------------------------// -FitCurveWrapper::FitCurveWrapper() -{ -} - FitCurveWrapper::~FitCurveWrapper() { _vertices.clear(); diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h index c08dc52249e..dc60d67b943 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.h +++ b/source/blender/freestyle/intern/geometry/FitCurve.h @@ -70,7 +70,6 @@ class FitCurveWrapper { std::vector<Vector2> _vertices; public: - FitCurveWrapper(); ~FitCurveWrapper(); /*! Fits a set of 2D data points to a set of Bezier Curve segments diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.cpp b/source/blender/freestyle/intern/geometry/GridHelpers.cpp index a83dc385758..ee64b83f19e 100644 --- a/source/blender/freestyle/intern/geometry/GridHelpers.cpp +++ b/source/blender/freestyle/intern/geometry/GridHelpers.cpp @@ -42,8 +42,6 @@ void GridHelpers::getDefaultViewProscenium(real viewProscenium[4]) viewProscenium[3] = g_freestyle.viewport[3] * (1.0f - borderZone + bufferZone); } -GridHelpers::Transform::~Transform() -{ -} +GridHelpers::Transform::~Transform() = default; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp index 2310525a1e1..77a80e63b77 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp +++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp @@ -36,10 +36,6 @@ namespace Freestyle::OGF { //_________________________________________________________ -NormalCycle::NormalCycle() -{ -} - void NormalCycle::begin() { M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0; diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 5adef773be1..9d8ffcfd7fb 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -64,7 +64,6 @@ template<class T> inline void ogf_swap(T &x, T &y) */ class NormalCycle { public: - NormalCycle(); void begin(); void end(); /** diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp index 4fc1f227172..cb30a661aaa 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp @@ -105,17 +105,6 @@ NodeOrthographicCamera::NodeOrthographicCamera( projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear); } -NodeOrthographicCamera::NodeOrthographicCamera(const NodeOrthographicCamera &iBrother) - : NodeCamera(iBrother), - left_(iBrother.left_), - right_(iBrother.right_), - bottom_(iBrother.bottom_), - top_(iBrother.top_), - zNear_(iBrother.zNear_), - zFar_(iBrother.zFar_) -{ -} - NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE) { } diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index cc7b1f7f67c..9e3f9046e39 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -136,7 +136,7 @@ class NodeOrthographicCamera : public NodeCamera { return zFar_; } - NodeOrthographicCamera(const NodeOrthographicCamera &iBrother); + NodeOrthographicCamera(const NodeOrthographicCamera &iBrother) = default; private: double left_; diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index e3d49c167b5..0a9e7114ecb 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -164,7 +164,7 @@ class ChainingIterator : public ViewEdgeInternal::ViewEdgeIterator { * Indicates whether to force the chaining to stay within * the set of selected ViewEdges or not. * \param iRestrictToUnvisited: - * Indicates whether a ViewEdge that has already been chained must be ignored ot not. + * Indicates whether a ViewEdge that has already been chained must be ignored or not. * \param begin: * The ViewEdge from which to start the chain. * \param orientation: diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 91470b57ca2..f0db45150a9 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -236,9 +236,7 @@ class CurvePoint : public Interface0D { CurvePoint &operator=(const CurvePoint &iBrother); /*! Destructor */ - virtual ~CurvePoint() - { - } + virtual ~CurvePoint() = default; /*! Operator == */ bool operator==(const CurvePoint &b) diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 79eb37ae870..0de3e03d44a 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -383,10 +383,6 @@ StrokeVertex::StrokeVertex(SVertex *iSVertex, const StrokeAttribute &iAttribute) _StrokeLength = 0.0f; } -StrokeVertex::~StrokeVertex() -{ -} - StrokeVertex &StrokeVertex::operator=(const StrokeVertex &iBrother) { ((CurvePoint *)this)->operator=(iBrother); diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 5772b80b093..4a9ed7288c5 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -355,9 +355,6 @@ class StrokeVertex : public CurvePoint { /*! Builds a stroke from a view vertex and an attribute */ StrokeVertex(SVertex *iSVertex, const StrokeAttribute &iAttribute); - /*! destructor */ - virtual ~StrokeVertex(); - /* operators */ /*! operator = */ StrokeVertex &operator=(const StrokeVertex &iBrother); diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp index a4268e43a56..797fcc1aabc 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp @@ -37,13 +37,7 @@ namespace Freestyle { TextureManager *StrokeRenderer::_textureManager = nullptr; -StrokeRenderer::StrokeRenderer() -{ -} - -StrokeRenderer::~StrokeRenderer() -{ -} +StrokeRenderer::~StrokeRenderer() = default; bool StrokeRenderer::loadTextures() { diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 2fb08b880d9..d3ed8bde8a3 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -121,7 +121,6 @@ class TextureManager { * first rendering */ class StrokeRenderer { public: - StrokeRenderer(); virtual ~StrokeRenderer(); /*! Renders a stroke rep */ diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index c05c269c404..7f568fcf460 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -41,10 +41,6 @@ namespace Freestyle { real PseudoNoise::_values[]; -PseudoNoise::PseudoNoise() -{ -} - void PseudoNoise::init(long seed) { RandGen::srand48(seed); diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index 38270016675..3be74bf0110 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h @@ -31,8 +31,6 @@ namespace Freestyle { class PseudoNoise { public: - PseudoNoise(); - virtual ~PseudoNoise() { } diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp index 6c5cbc71a76..923748e6d7d 100644 --- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp @@ -55,10 +55,6 @@ ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource &sourc initialize(proscenium); } -ArbitraryGridDensityProvider::~ArbitraryGridDensityProvider() -{ -} - void ArbitraryGridDensityProvider::initialize(const real proscenium[4]) { float prosceniumWidth = (proscenium[1] - proscenium[0]); @@ -99,10 +95,6 @@ ArbitraryGridDensityProviderFactory::ArbitraryGridDensityProviderFactory(unsigne { } -ArbitraryGridDensityProviderFactory::~ArbitraryGridDensityProviderFactory() -{ -} - AutoPtr<GridDensityProvider> ArbitraryGridDensityProviderFactory::newGridDensityProvider( OccluderSource &source, const real proscenium[4]) { diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h index c2d843742df..ce23d23d7ed 100644 --- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h @@ -39,7 +39,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider { const GridHelpers::Transform &transform, unsigned numCells); ArbitraryGridDensityProvider(OccluderSource &source, unsigned numCells); - virtual ~ArbitraryGridDensityProvider(); protected: unsigned numCells; @@ -51,7 +50,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider { class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory { public: ArbitraryGridDensityProviderFactory(unsigned numCells); - ~ArbitraryGridDensityProviderFactory(); AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source, const real proscenium[4]); diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp index 1384dc0f78b..9fa8f9dcbc2 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp @@ -56,10 +56,6 @@ AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource &s initialize(proscenium, sizeFactor); } -AverageAreaGridDensityProvider::~AverageAreaGridDensityProvider() -{ -} - void AverageAreaGridDensityProvider::initialize(const real proscenium[4], real sizeFactor) { float prosceniumWidth = (proscenium[1] - proscenium[0]); @@ -120,10 +116,6 @@ AverageAreaGridDensityProviderFactory::AverageAreaGridDensityProviderFactory(rea { } -AverageAreaGridDensityProviderFactory::~AverageAreaGridDensityProviderFactory() -{ -} - AutoPtr<GridDensityProvider> AverageAreaGridDensityProviderFactory::newGridDensityProvider( OccluderSource &source, const real proscenium[4]) { diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h index 5336cc1ff97..402fc6f210d 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h @@ -39,7 +39,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider { const GridHelpers::Transform &transform, real sizeFactor); AverageAreaGridDensityProvider(OccluderSource &source, real sizeFactor); - virtual ~AverageAreaGridDensityProvider(); private: void initialize(const real proscenium[4], real sizeFactor); @@ -48,7 +47,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider { class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory { public: AverageAreaGridDensityProviderFactory(real sizeFactor); - ~AverageAreaGridDensityProviderFactory(); AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source, const real proscenium[4]); diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp index e81291c94bc..ffc0d41bfba 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp +++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp @@ -38,14 +38,6 @@ namespace Freestyle { // Cell ///////// -BoxGrid::Cell::Cell() -{ -} - -BoxGrid::Cell::~Cell() -{ -} - void BoxGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY) { const real epsilon = 1.0e-06; @@ -87,10 +79,6 @@ BoxGrid::Iterator::Iterator(BoxGrid &grid, Vec3r ¢er, real /*epsilon*/) _current = _cell->faces.begin(); } -BoxGrid::Iterator::~Iterator() -{ -} - // BoxGrid ///////////////// @@ -124,9 +112,7 @@ BoxGrid::BoxGrid(OccluderSource &source, } } -BoxGrid::~BoxGrid() -{ -} +BoxGrid::~BoxGrid() = default; void BoxGrid::assignCells(OccluderSource & /*source*/, GridDensityProvider &density, @@ -242,10 +228,6 @@ bool BoxGrid::enableQI() const return _enableQI; } -BoxGrid::Transform::Transform() -{ -} - Vec3r BoxGrid::Transform::operator()(const Vec3r &point) const { return Vec3r(point[0], point[1], -point[2]); diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 581ee0a2340..23085d37a3f 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -73,8 +73,7 @@ class BoxGrid { // Cell(const Cell& other); // Cell& operator=(const Cell& other); - explicit Cell(); - ~Cell(); + explicit Cell() = default; static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b); @@ -105,7 +104,6 @@ class BoxGrid { // epsilon is not used in this class, but other grids with the same interface may need an // epsilon explicit Iterator(BoxGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06); - ~Iterator(); void initBeforeTarget(); void initAfterTarget(); void nextOccluder(); @@ -134,7 +132,7 @@ class BoxGrid { class Transform : public GridHelpers::Transform { public: - explicit Transform(); + explicit Transform() = default; explicit Transform(Transform &other); Vec3r operator()(const Vec3r &point) const; }; diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index a6781bfc8d1..61de0078a8f 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -44,10 +44,6 @@ CulledOccluderSource::CulledOccluderSource(const GridHelpers::Transform &t, } } -CulledOccluderSource::~CulledOccluderSource() -{ -} - bool CulledOccluderSource::testCurrent() { if (valid) { diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.h b/source/blender/freestyle/intern/view_map/CulledOccluderSource.h index 2bb77bad0f7..16f57f6dc2a 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.h +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.h @@ -36,7 +36,6 @@ class CulledOccluderSource : public OccluderSource { WingedEdge &we, ViewMap &viewMap, bool extensiveFEdgeSearch = true); - virtual ~CulledOccluderSource(); void cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSearch); diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp index 26a40ee587c..683482d6848 100644 --- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp +++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp @@ -29,10 +29,6 @@ HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real si { } -HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory() -{ -} - AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider( OccluderSource &source, const real proscenium[4]) { diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h index 0ce62572092..df0f4bd3547 100644 --- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h +++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h @@ -32,7 +32,6 @@ namespace Freestyle { class HeuristicGridDensityProviderFactory : public GridDensityProviderFactory { public: HeuristicGridDensityProviderFactory(real sizeFactor, unsigned numFaces); - ~HeuristicGridDensityProviderFactory(); AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source, const real proscenium[4]); diff --git a/source/blender/freestyle/intern/view_map/OccluderSource.cpp b/source/blender/freestyle/intern/view_map/OccluderSource.cpp index 618fa781fa7..57e6e39b809 100644 --- a/source/blender/freestyle/intern/view_map/OccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/OccluderSource.cpp @@ -33,9 +33,7 @@ OccluderSource::OccluderSource(const GridHelpers::Transform &t, WingedEdge &we) begin(); } -OccluderSource::~OccluderSource() -{ -} +OccluderSource::~OccluderSource() = default; void OccluderSource::buildCachedPolygon() { diff --git a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp index 7e7f4e14882..b9bf585a9e7 100644 --- a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp @@ -54,10 +54,6 @@ Pow23GridDensityProvider::Pow23GridDensityProvider(OccluderSource &source, unsig initialize(proscenium); } -Pow23GridDensityProvider::~Pow23GridDensityProvider() -{ -} - void Pow23GridDensityProvider::initialize(const real proscenium[4]) { float prosceniumWidth = (proscenium[1] - proscenium[0]); @@ -98,10 +94,6 @@ Pow23GridDensityProviderFactory::Pow23GridDensityProviderFactory(unsigned numFac { } -Pow23GridDensityProviderFactory::~Pow23GridDensityProviderFactory() -{ -} - AutoPtr<GridDensityProvider> Pow23GridDensityProviderFactory::newGridDensityProvider( OccluderSource &source, const real proscenium[4]) { diff --git a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h index fec869e0665..d150786b1c7 100644 --- a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h @@ -37,7 +37,6 @@ class Pow23GridDensityProvider : public GridDensityProvider { const GridHelpers::Transform &transform, unsigned numFaces); Pow23GridDensityProvider(OccluderSource &source, unsigned numFaces); - virtual ~Pow23GridDensityProvider(); protected: unsigned numFaces; @@ -49,7 +48,6 @@ class Pow23GridDensityProvider : public GridDensityProvider { class Pow23GridDensityProviderFactory : public GridDensityProviderFactory { public: Pow23GridDensityProviderFactory(unsigned numFaces); - ~Pow23GridDensityProviderFactory(); AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source, const real proscenium[4]); diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp index db567d6b5ef..f6c57588e35 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp @@ -38,14 +38,6 @@ namespace Freestyle { // Cell ///////// -SphericalGrid::Cell::Cell() -{ -} - -SphericalGrid::Cell::~Cell() -{ -} - void SphericalGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY) { const real epsilon = 1.0e-06; @@ -87,10 +79,6 @@ SphericalGrid::Iterator::Iterator(SphericalGrid &grid, Vec3r ¢er, real /*eps _current = _cell->faces.begin(); } -SphericalGrid::Iterator::~Iterator() -{ -} - // SphericalGrid ///////////////// @@ -121,9 +109,7 @@ SphericalGrid::SphericalGrid(OccluderSource &source, } } -SphericalGrid::~SphericalGrid() -{ -} +SphericalGrid::~SphericalGrid() = default; void SphericalGrid::assignCells(OccluderSource & /*source*/, GridDensityProvider &density, @@ -238,10 +224,6 @@ bool SphericalGrid::enableQI() const return _enableQI; } -SphericalGrid::Transform::Transform() -{ -} - Vec3r SphericalGrid::Transform::operator()(const Vec3r &point) const { return sphericalProjection(point); diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index 0ef68d073ae..efa3530cb2a 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -73,8 +73,7 @@ class SphericalGrid { // Cell(const Cell& other); // Cell& operator=(const Cell& other); - explicit Cell(); - ~Cell(); + explicit Cell() = default; static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b); @@ -106,7 +105,6 @@ class SphericalGrid { // epsilon is not used in this class, but other grids with the same interface may need an // epsilon explicit Iterator(SphericalGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06); - ~Iterator(); void initBeforeTarget(); void initAfterTarget(); void nextOccluder(); @@ -135,7 +133,7 @@ class SphericalGrid { class Transform : public GridHelpers::Transform { public: - explicit Transform(); + explicit Transform() = default; explicit Transform(Transform &other); Vec3r operator()(const Vec3r &point) const; static Vec3r sphericalProjection(const Vec3r &M); diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index cbb5c730b2b..cd0059f3c21 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -2322,10 +2322,6 @@ struct less_Intersection { }; struct silhouette_binary_rule : public binary_rule<segment, segment> { - silhouette_binary_rule() - { - } - bool operator()(segment &s1, segment &s2) override { FEdge *f1 = s1.edge(); |