Fixed more clang warnings
This commit is contained in:
@@ -131,7 +131,6 @@ MeshViewerWidgetT<M>::open_mesh(const char* _filename, IO::Options _opt)
|
|||||||
typename Mesh::ConstVertexIter vIt(mesh_.vertices_begin());
|
typename Mesh::ConstVertexIter vIt(mesh_.vertices_begin());
|
||||||
typename Mesh::ConstVertexIter vEnd(mesh_.vertices_end());
|
typename Mesh::ConstVertexIter vEnd(mesh_.vertices_end());
|
||||||
|
|
||||||
typedef typename Mesh::Point Point;
|
|
||||||
using OpenMesh::Vec3f;
|
using OpenMesh::Vec3f;
|
||||||
|
|
||||||
Vec3f bbMin, bbMax;
|
Vec3f bbMin, bbMax;
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ public: // inherited
|
|||||||
n_roots_ = calc_bits_for_roots(n_vertices_);
|
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 ),
|
level_t newlevel = std::max( BaseModQ::mesh().property( level_, _ci.v0 ),
|
||||||
BaseModQ::mesh().property( level_, _ci.v1 ) )+1;
|
BaseModQ::mesh().property( level_, _ci.v1 ) )+1;
|
||||||
@@ -135,7 +135,7 @@ public: // inherited
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// post-process halfedge collapse (accumulate quadrics)
|
/// post-process halfedge collapse (accumulate quadrics)
|
||||||
void postprocess_collapse(const CollapseInfo& _ci)
|
void postprocess_collapse(const CollapseInfo& _ci) override
|
||||||
{
|
{
|
||||||
BaseModQ::postprocess_collapse( _ci );
|
BaseModQ::postprocess_collapse( _ci );
|
||||||
|
|
||||||
|
|||||||
@@ -111,16 +111,16 @@ class ModAspectRatioT: public ModBaseT<MeshT> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// precompute face aspect ratio
|
/// precompute face aspect ratio
|
||||||
void initialize();
|
void initialize() override;
|
||||||
|
|
||||||
/// Returns the collapse priority
|
/// Returns the collapse priority
|
||||||
float collapse_priority(const CollapseInfo& _ci);
|
float collapse_priority(const CollapseInfo& _ci) override;
|
||||||
|
|
||||||
/// update aspect ratio of one-ring
|
/// update aspect ratio of one-ring
|
||||||
void preprocess_collapse(const CollapseInfo& _ci);
|
void preprocess_collapse(const CollapseInfo& _ci) override;
|
||||||
|
|
||||||
/// set percentage of aspect ratio
|
/// set percentage of aspect ratio
|
||||||
void set_error_tolerance_factor(double _factor);
|
void set_error_tolerance_factor(double _factor) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
@@ -98,10 +98,10 @@ class ModEdgeLengthT: public ModBaseT<MeshT> {
|
|||||||
Cont. mode: Collapse smallest edge first, but
|
Cont. mode: Collapse smallest edge first, but
|
||||||
don't collapse edges longer as edge_length_
|
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
|
/// set the percentage of edge length
|
||||||
void set_error_tolerance_factor(double _factor);
|
void set_error_tolerance_factor(double _factor) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class ModHausdorffT: public ModBaseT<MeshT> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// reset per-face point lists
|
/// reset per-face point lists
|
||||||
virtual void initialize();
|
virtual void initialize() override;
|
||||||
|
|
||||||
/** \brief compute Hausdorff error for one-ring
|
/** \brief compute Hausdorff error for one-ring
|
||||||
*
|
*
|
||||||
@@ -120,13 +120,13 @@ class ModHausdorffT: public ModBaseT<MeshT> {
|
|||||||
* @return Binary return, if collapse is legal or illegal
|
* @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
|
/// re-distribute points
|
||||||
virtual void postprocess_collapse(const CollapseInfo& _ci) override;
|
virtual void postprocess_collapse(const CollapseInfo& _ci) override;
|
||||||
|
|
||||||
/// set the percentage of tolerance
|
/// set the percentage of tolerance
|
||||||
void set_error_tolerance_factor(double _factor);
|
void set_error_tolerance_factor(double _factor) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
/// Allocate and init normal cones
|
/// Allocate and init normal cones
|
||||||
void initialize() {
|
void initialize() override {
|
||||||
if (!normal_cones_.is_valid())
|
if (!normal_cones_.is_valid())
|
||||||
mesh_.add_property(normal_cones_);
|
mesh_.add_property(normal_cones_);
|
||||||
|
|
||||||
@@ -165,7 +165,7 @@ public:
|
|||||||
* @param _ci Collapse info data
|
* @param _ci Collapse info data
|
||||||
* @return Half of the normal cones size (radius in radians)
|
* @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
|
// simulate collapse
|
||||||
mesh_.set_point(_ci.v0, _ci.p1);
|
mesh_.set_point(_ci.v0, _ci.p1);
|
||||||
|
|
||||||
@@ -203,7 +203,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// set the percentage of normal deviation
|
/// 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) {
|
if (_factor >= 0.0 && _factor <= 1.0) {
|
||||||
// the smaller the factor, the smaller normal_deviation_ gets
|
// the smaller the factor, the smaller normal_deviation_ gets
|
||||||
// thus creating a stricter constraint
|
// thus creating a stricter constraint
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ public:
|
|||||||
*
|
*
|
||||||
* \see set_max_normal_deviation()
|
* \see set_max_normal_deviation()
|
||||||
*/
|
*/
|
||||||
float collapse_priority(const CollapseInfo& _ci)
|
float collapse_priority(const CollapseInfo& _ci) override
|
||||||
{
|
{
|
||||||
// simulate collapse
|
// simulate collapse
|
||||||
Base::mesh().set_point(_ci.v0, _ci.p1);
|
Base::mesh().set_point(_ci.v0, _ci.p1);
|
||||||
@@ -154,7 +154,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// set the percentage of maximum normal deviation
|
/// 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) {
|
if (_factor >= 0.0 && _factor <= 1.0) {
|
||||||
// the smaller the factor, the smaller max_deviation_ gets
|
// the smaller the factor, the smaller max_deviation_ gets
|
||||||
// thus creating a stricter constraint
|
// thus creating a stricter constraint
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
|
|||||||
* \return LEGAL_COLLAPSE or ILLEGAL_COLLAPSE in binary mode
|
* \return LEGAL_COLLAPSE or ILLEGAL_COLLAPSE in binary mode
|
||||||
* \see set_min_roundness()
|
* \see set_min_roundness()
|
||||||
*/
|
*/
|
||||||
float collapse_priority(const CollapseInfo& _ci)
|
float collapse_priority(const CollapseInfo& _ci) override
|
||||||
{
|
{
|
||||||
// using namespace OpenMesh;
|
// using namespace OpenMesh;
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// set the percentage of minimum roundness
|
/// 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 (this->is_binary()) {
|
||||||
if (_factor >= 0.0 && _factor <= 1.0) {
|
if (_factor >= 0.0 && _factor <= 1.0) {
|
||||||
// the smaller the factor, the smaller min_r_ gets
|
// the smaller the factor, the smaller min_r_ gets
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ public:
|
|||||||
|
|
||||||
explicit VV(M& _mesh) : Inherited(_mesh) {}
|
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(Face) // avoid warning
|
||||||
MIPS_WARN_WA(Edge) // avoid warning
|
MIPS_WARN_WA(Edge) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -301,7 +301,7 @@ public:
|
|||||||
|
|
||||||
explicit VVc(M& _mesh) : Inherited(_mesh) {}
|
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(Face) // avoid warning
|
||||||
MIPS_WARN_WA(Edge) // avoid warning
|
MIPS_WARN_WA(Edge) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -323,7 +323,7 @@ public:
|
|||||||
|
|
||||||
explicit VE(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -345,7 +345,7 @@ public:
|
|||||||
|
|
||||||
explicit VdE(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -367,7 +367,7 @@ public:
|
|||||||
|
|
||||||
explicit VdEc(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -389,7 +389,7 @@ public:
|
|||||||
|
|
||||||
explicit EV(M& _mesh) : Inherited(_mesh) {}
|
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(Face) // avoid warning
|
||||||
MIPS_WARN_WA(Edge) // avoid warning
|
MIPS_WARN_WA(Edge) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -448,7 +448,7 @@ public:
|
|||||||
|
|
||||||
explicit EF(M& _mesh) : Inherited(_mesh) {}
|
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(Edge ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -470,7 +470,7 @@ public:
|
|||||||
|
|
||||||
explicit FE(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -492,7 +492,7 @@ public:
|
|||||||
|
|
||||||
explicit EdE(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
@@ -514,7 +514,7 @@ public:
|
|||||||
|
|
||||||
explicit EdEc(M& _mesh) : Inherited(_mesh) {}
|
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(Face ) // avoid warning
|
||||||
MIPS_WARN_WA(Vertex) // avoid warning
|
MIPS_WARN_WA(Vertex) // avoid warning
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user