Commit 11376f3c authored by Jan Möbius's avatar Jan Möbius

Fixed several conversion warnings

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@850 fdac6126-5c0c-442c-9429-916003d36597
parent c9c68894
......@@ -76,7 +76,12 @@ void ArrayKernel::garbage_collection(std_API_Container_VHandlePointer& vh_to_upd
const bool track_hhandles = ( !hh_to_update.empty() );
const bool track_fhandles = ( !fh_to_update.empty() );
int i, i0, i1, nV(int(n_vertices())), nE(int(n_edges())), nH(int(2*n_edges())), nF(int(n_faces()));
int i, i0, i1;
int nV = int(n_vertices());
int nE = int(n_edges());
int nH = int(2*n_edges());
int nF = (int(n_faces()));
std::vector<VertexHandle> vh_map;
std::vector<HalfedgeHandle> hh_map;
......
......@@ -237,8 +237,8 @@ size_t DecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
typename Mesh::HalfedgeHandle v0v1;
typename Mesh::VertexVertexIter vv_it;
typename Mesh::VertexFaceIter vf_it;
unsigned int nv = mesh_.n_vertices();
unsigned int nf = mesh_.n_faces();
size_t nv = mesh_.n_vertices();
size_t nf = mesh_.n_faces();
unsigned int n_collapses = 0;
typedef std::vector<typename Mesh::VertexHandle> Support;
......
......@@ -224,8 +224,8 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
if ( (_nv == 0) && (_nf == 1) )
return decimate_constraints_only(1.0);
unsigned int nv = mesh_.n_vertices();
unsigned int nf = mesh_.n_faces();
size_t nv = mesh_.n_vertices();
size_t nf = mesh_.n_faces();
unsigned int n_collapses(0);
......
......@@ -119,21 +119,21 @@ size_t MixedDecimaterT<Mesh>::decimate_to_faces(const size_t _n_vertices,const
r_collapses = McDecimaterT<Mesh>::decimate_to_faces(n_vertices_mc, n_faces_mc);
} else {
const int samples = this->samples();
const size_t samples = this->samples();
// MinimalSample count for the McDecimater
const int min = 2;
const size_t min = 2;
// Maximal number of samples for the McDecimater
const int max = samples;
const size_t max = samples;
// Number of incremental steps
const int steps = 7;
const size_t steps = 7;
for ( int i = 0; i < steps; ++i ) {
for ( size_t i = 0; i < steps; ++i ) {
// Compute number of samples to be used
int samples = double( min) + double(i)/(double(steps)-1.0) * (max-2) ;
size_t samples = int (double( min) + double(i)/(double(steps)-1.0) * (max-2) ) ;
// We won't allow 1 here, as this is the last step in the incremental part
double decimaterLevel = (double(i + 1)) * _mc_factor / (double(steps) );
......
......@@ -147,7 +147,7 @@ public:
// the smaller the factor, the smaller max_deviation_ gets
// thus creating a stricter constraint
// division by error_tolerance_factor_ is for normalization
float max_normal_deviation = (max_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
double max_normal_deviation = (max_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
set_max_normal_deviation(max_normal_deviation);
this->error_tolerance_factor_ = _factor;
}
......@@ -157,15 +157,15 @@ public:
public:
/// get normal deviation
float max_normal_deviation() const { return max_deviation_ / M_PI * 180.0; }
double max_normal_deviation() const { return max_deviation_ / M_PI * 180.0; }
/** Set normal deviation
*
* Set the maximum angular deviation of the orignal normal and the new
* normal in degrees.
*/
void set_max_normal_deviation(float _f) {
max_deviation_ = _f / 180.0 * M_PI;
void set_max_normal_deviation(double _d) {
max_deviation_ = _d / 180.0 * M_PI;
min_cos_ = cos(max_deviation_);
}
......
......@@ -107,10 +107,10 @@ public:
public:
Sqrt3T(void) : parent_t(), _1over3( 1.0/3.0 ), _1over27( 1.0/27.0 )
Sqrt3T(void) : parent_t(), _1over3( real_t(1.0/3.0) ), _1over27( real_t(1.0/27.0) )
{ init_weights(); }
Sqrt3T(MeshType &_m) : parent_t(_m), _1over3( 1.0/3.0 ), _1over27( 1.0/27.0 )
Sqrt3T(MeshType &_m) : parent_t(_m), _1over3( real_t(1.0/3.0) ), _1over27( real_t(1.0/27.0) )
{ init_weights(); }
virtual ~Sqrt3T() {}
......
......@@ -156,10 +156,10 @@ public:
bool empty() const { return HeapVector::empty(); }
/// returns the size of heap
unsigned int size() const { return HeapVector::size(); }
size_t size() const { return HeapVector::size(); }
/// reserve space for _n entries
void reserve(unsigned int _n) { HeapVector::reserve(_n); }
void reserve(size_t _n) { HeapVector::reserve(_n); }
/// reset heap position to -1 (not in heap)
void reset_heap_position(HeapEntry _h)
......
......@@ -90,7 +90,7 @@ add_node(const VHierarchyNode &_node)
{
nodes_.push_back(_node);
return VHierarchyNodeHandle(nodes_.size() - 1);
return VHierarchyNodeHandle(int(nodes_.size() - 1));
}
......@@ -150,8 +150,8 @@ is_ancestor(VHierarchyNodeIndex _ancestor_index, VHierarchyNodeIndex _descendent
if (_ancestor_index.tree_id(tree_id_bits_) != _descendent_index.tree_id(tree_id_bits_))
return false;
unsigned int ancestor_node_id = _ancestor_index.node_id(tree_id_bits_);
unsigned int descendent_node_id = _descendent_index.node_id(tree_id_bits_);
unsigned int ancestor_node_id = _ancestor_index.node_id(tree_id_bits_);
unsigned int descendent_node_id = _descendent_index.node_id(tree_id_bits_);
if (ancestor_node_id > descendent_node_id)
return false;
......
......@@ -87,7 +87,7 @@ public:
void clear() { nodes_.clear(); n_roots_ = 0; }
unsigned char tree_id_bits() const { return tree_id_bits_; }
unsigned int num_roots() const { return n_roots_; }
unsigned int num_nodes() const { return nodes_.size(); }
size_t num_nodes() const { return nodes_.size(); }
VHierarchyNodeIndex generate_node_index(id_t _tree_id, id_t _node_id)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment