manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vcg/complex/algorithms/create/platonic.h
View File

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

2
vcg/complex/algorithms/stat.h
View File

@ -244,7 +244,7 @@ public:
if(!(*fi).IsD()) if(!(*fi).IsD())
{ {
for(int i=0;i<3;++i) 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); return sum/(m.fn*3.0);
} }

3520
vcg/space/colorspace.h
View File

File diff suppressed because it is too large Load Diff