diff options
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
16 files changed, 7 insertions, 93 deletions
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(); |