This commit is contained in:
Jan Möbius
2019-05-29 08:32:28 +02:00
parent 4afdd5adcc
commit 669b1b789e
16 changed files with 43 additions and 41 deletions

View File

@@ -94,7 +94,7 @@ public: //-------------------------------------------------------- public types
typedef typename ModuleList::iterator ModuleListIterator;
public: //------------------------------------------------------ public methods
BaseDecimaterT(Mesh& _mesh);
explicit BaseDecimaterT(Mesh& _mesh);
virtual ~BaseDecimaterT();
/** Initialize decimater and decimating modules.

View File

@@ -89,7 +89,7 @@ public: //-------------------------------------------------------- public types
public: //------------------------------------------------------ public methods
/// Constructor
DecimaterT( Mesh& _mesh );
explicit DecimaterT( Mesh& _mesh );
/// Destructor
~DecimaterT();

View File

@@ -72,7 +72,7 @@ class ModIndependentSetsT: public ModBaseT<MeshT> {
;
/// Constructor
ModIndependentSetsT(MeshT &_mesh) :
explicit ModIndependentSetsT(MeshT &_mesh) :
Base(_mesh, true) {
}

View File

@@ -208,9 +208,9 @@ public:
// the smaller the factor, the smaller normal_deviation_ gets
// thus creating a stricter constraint
// division by error_tolerance_factor_ is for normalization
Scalar normal_deviation = normal_deviation_ * static_cast<Scalar>( 180.0 / M_PI * _factor / this->error_tolerance_factor_);
Scalar normal_deviation_value = normal_deviation_ * static_cast<Scalar>( 180.0 / M_PI * _factor / this->error_tolerance_factor_);
set_normal_deviation(normal_deviation);
set_normal_deviation(normal_deviation_value);
this->error_tolerance_factor_ = _factor;
}
}

View File

@@ -86,7 +86,7 @@ public:
public:
/// Constructor
ModNormalFlippingT( MeshT &_mesh) : Base(_mesh, true)
explicit ModNormalFlippingT( MeshT &_mesh) : Base(_mesh, true)
{
set_max_normal_deviation( 90.0f );
const bool mesh_has_normals = _mesh.has_face_normals();
@@ -159,8 +159,8 @@ public:
// the smaller the factor, the smaller max_deviation_ gets
// thus creating a stricter constraint
// division by error_tolerance_factor_ is for normalization
double max_normal_deviation = (max_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
set_max_normal_deviation(max_normal_deviation);
double max_normal_deviation_value = (max_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
set_max_normal_deviation(max_normal_deviation_value);
this->error_tolerance_factor_ = _factor;
}
}

View File

@@ -97,7 +97,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
public:
/// Constructor
ModRoundnessT( MeshT &_dec ) :
explicit ModRoundnessT( MeshT &_dec ) :
Base(_dec, false),
min_r_(-1.0)
{ }

View File

@@ -258,9 +258,9 @@ public:
bool check()
{
bool ok(true);
unsigned int i, j;
for (i=0; i<size(); ++i)
for (unsigned int i=0; i<size(); ++i)
{
unsigned int j;
if (((j=left(i))<size()) && interface_.greater(entry(i), entry(j)))
{
omerr() << "Heap condition violated\n";