diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh index dc10a9a7..9dda329b 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh @@ -131,7 +131,6 @@ MeshViewerWidgetT::open_mesh(const char* _filename, IO::Options _opt) typename Mesh::ConstVertexIter vIt(mesh_.vertices_begin()); typename Mesh::ConstVertexIter vEnd(mesh_.vertices_end()); - typedef typename Mesh::Point Point; using OpenMesh::Vec3f; Vec3f bbMin, bbMax; diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc index ae3e7077..77b7dae6 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc @@ -114,7 +114,7 @@ public: // inherited n_roots_ = calc_bits_for_roots(n_vertices_); } - virtual float collapse_priority(const CollapseInfo& _ci) + virtual float collapse_priority(const CollapseInfo& _ci) override { level_t newlevel = std::max( BaseModQ::mesh().property( level_, _ci.v0 ), BaseModQ::mesh().property( level_, _ci.v1 ) )+1; @@ -135,7 +135,7 @@ public: // inherited } /// post-process halfedge collapse (accumulate quadrics) - void postprocess_collapse(const CollapseInfo& _ci) + void postprocess_collapse(const CollapseInfo& _ci) override { BaseModQ::postprocess_collapse( _ci ); diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh index 4977fa6d..0213cbbb 100644 --- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh +++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh @@ -111,16 +111,16 @@ class ModAspectRatioT: public ModBaseT { } /// precompute face aspect ratio - void initialize(); + void initialize() override; /// Returns the collapse priority - float collapse_priority(const CollapseInfo& _ci); + float collapse_priority(const CollapseInfo& _ci) override; /// update aspect ratio of one-ring - void preprocess_collapse(const CollapseInfo& _ci); + void preprocess_collapse(const CollapseInfo& _ci) override; /// set percentage of aspect ratio - void set_error_tolerance_factor(double _factor); + void set_error_tolerance_factor(double _factor) override; private: diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh index 4b7ec155..e8e75a39 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh @@ -98,10 +98,10 @@ class ModEdgeLengthT: public ModBaseT { Cont. mode: Collapse smallest edge first, but don't collapse edges longer as edge_length_ */ - float collapse_priority(const CollapseInfo& _ci); + float collapse_priority(const CollapseInfo& _ci) override; /// set the percentage of edge length - void set_error_tolerance_factor(double _factor); + void set_error_tolerance_factor(double _factor) override; private: diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh index 736f80d6..74c76373 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh @@ -108,7 +108,7 @@ class ModHausdorffT: public ModBaseT { } /// reset per-face point lists - virtual void initialize(); + virtual void initialize() override; /** \brief compute Hausdorff error for one-ring * @@ -120,13 +120,13 @@ class ModHausdorffT: public ModBaseT { * @return Binary return, if collapse is legal or illegal */ - virtual float collapse_priority(const CollapseInfo& _ci); + virtual float collapse_priority(const CollapseInfo& _ci) override; /// re-distribute points virtual void postprocess_collapse(const CollapseInfo& _ci) override; /// set the percentage of tolerance - void set_error_tolerance_factor(double _factor); + void set_error_tolerance_factor(double _factor) override; private: diff --git a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh index ed693dae..9966d826 100644 --- a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh +++ b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh @@ -140,7 +140,7 @@ public: /// Allocate and init normal cones - void initialize() { + void initialize() override { if (!normal_cones_.is_valid()) mesh_.add_property(normal_cones_); @@ -165,7 +165,7 @@ public: * @param _ci Collapse info data * @return Half of the normal cones size (radius in radians) */ - float collapse_priority(const CollapseInfo& _ci) { + float collapse_priority(const CollapseInfo& _ci) override { // simulate collapse mesh_.set_point(_ci.v0, _ci.p1); @@ -203,7 +203,7 @@ public: } /// set the percentage of normal deviation - void set_error_tolerance_factor(double _factor) { + void set_error_tolerance_factor(double _factor) override { if (_factor >= 0.0 && _factor <= 1.0) { // the smaller the factor, the smaller normal_deviation_ gets // thus creating a stricter constraint diff --git a/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh b/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh index 9833e182..b2a00fd3 100644 --- a/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh +++ b/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh @@ -122,7 +122,7 @@ public: * * \see set_max_normal_deviation() */ - float collapse_priority(const CollapseInfo& _ci) + float collapse_priority(const CollapseInfo& _ci) override { // simulate collapse Base::mesh().set_point(_ci.v0, _ci.p1); @@ -154,7 +154,7 @@ public: } /// set the percentage of maximum normal deviation - void set_error_tolerance_factor(double _factor) { + void set_error_tolerance_factor(double _factor) override { if (_factor >= 0.0 && _factor <= 1.0) { // the smaller the factor, the smaller max_deviation_ gets // thus creating a stricter constraint diff --git a/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh b/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh index 5b3c1485..afd5ade4 100644 --- a/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh +++ b/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh @@ -117,7 +117,7 @@ class ModRoundnessT : public ModBaseT * \return LEGAL_COLLAPSE or ILLEGAL_COLLAPSE in binary mode * \see set_min_roundness() */ - float collapse_priority(const CollapseInfo& _ci) + float collapse_priority(const CollapseInfo& _ci) override { // using namespace OpenMesh; @@ -174,7 +174,7 @@ class ModRoundnessT : public ModBaseT } /// set the percentage of minimum roundness - void set_error_tolerance_factor(double _factor) { + void set_error_tolerance_factor(double _factor) override { if (this->is_binary()) { if (_factor >= 0.0 && _factor <= 1.0) { // the smaller the factor, the smaller min_r_ gets diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh index 71926139..2c2e7679 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh @@ -279,7 +279,7 @@ public: explicit VV(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::VertexHandle& _vh, state_t _target_state); + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; MIPS_WARN_WA(Face) // avoid warning MIPS_WARN_WA(Edge) // avoid warning }; @@ -301,7 +301,7 @@ public: explicit VVc(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::VertexHandle& _vh, state_t _target_state); + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; MIPS_WARN_WA(Face) // avoid warning MIPS_WARN_WA(Edge) // avoid warning }; @@ -323,7 +323,7 @@ public: explicit VE(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -345,7 +345,7 @@ public: explicit VdE(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -367,7 +367,7 @@ public: explicit VdEc(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -389,7 +389,7 @@ public: explicit EV(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::VertexHandle& _vh, state_t _target_state); + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; MIPS_WARN_WA(Face) // avoid warning MIPS_WARN_WA(Edge) // avoid warning }; @@ -448,7 +448,7 @@ public: explicit EF(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::FaceHandle& _fh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; MIPS_WARN_WA(Edge ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -470,7 +470,7 @@ public: explicit FE(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -492,7 +492,7 @@ public: explicit EdE(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning }; @@ -514,7 +514,7 @@ public: explicit EdEc(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; MIPS_WARN_WA(Face ) // avoid warning MIPS_WARN_WA(Vertex) // avoid warning };