Fixed more clang warnings

This commit is contained in:
Jan Möbius
2019-05-29 11:27:23 +02:00
parent 6050565b86
commit df6c3cbb93
9 changed files with 28 additions and 29 deletions

View File

@@ -111,16 +111,16 @@ class ModAspectRatioT: public ModBaseT<MeshT> {
}
/// 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:

View File

@@ -98,10 +98,10 @@ class ModEdgeLengthT: public ModBaseT<MeshT> {
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:

View File

@@ -108,7 +108,7 @@ class ModHausdorffT: public ModBaseT<MeshT> {
}
/// 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<MeshT> {
* @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:

View File

@@ -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

View File

@@ -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

View File

@@ -117,7 +117,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
* \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<MeshT>
}
/// 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