Reasonable but harmless clang warning cleanup

This commit is contained in:
Paolo Cignoni 2014-07-03 21:28:40 +00:00
parent afc802107a
commit a743e93a70
3 changed files with 1766 additions and 1765 deletions

View File

@ -361,6 +361,7 @@ template <class MeshType>
void SphericalCap(MeshType &in, float angleRad, const int subdiv = 3 )
{
typedef typename MeshType::CoordType CoordType;
typedef typename MeshType::VertexIterator VertexIterator;
in.Clear();
tri::Allocator<MeshType>::AddVertex(in,CoordType(0,0,0));
for(int i=0;i<6;++i)
@ -389,12 +390,12 @@ void SphericalCap(MeshType &in, float angleRad, const int subdiv = 3 )
float angleHalfRad = angleRad /2.0f;
float width = sin(angleHalfRad);
tri::UpdatePosition<MeshType>::Scale(in,width);
for(size_t i=0;i<in.vn;++i)
tri::Allocator<MeshType>::CompactEveryVector(in);
for(VertexIterator vi=in.vert.begin(); vi!=in.vert.end();++vi)
{
float cosVi = in.vert[i].P().Norm();
float cosVi = vi->P().Norm();
float angVi = asin (cosVi);
in.vert[i].P()[2] = cos(angVi) - cos(angleHalfRad);
vi->P()[2] = cos(angVi) - cos(angleHalfRad);
}
}

View File

@ -244,7 +244,7 @@ public:
if(!(*fi).IsD())
{
for(int i=0;i<3;++i)
sum+=double(Distance<float>(fi->P0(i),fi->P1(i)));
sum+=double(Distance(fi->P0(i),fi->P1(i)));
}
return sum/(m.fn*3.0);
}

File diff suppressed because it is too large Load Diff