diff --git a/vcg/complex/algorithms/create/platonic.h b/vcg/complex/algorithms/create/platonic.h index af89646b..0929e995 100644 --- a/vcg/complex/algorithms/create/platonic.h +++ b/vcg/complex/algorithms/create/platonic.h @@ -871,10 +871,10 @@ void OrientedDisk(MeshType &m, int slices, typename MeshType::CoordType center, { Disk(m,slices); tri::UpdatePosition::Scale(m,radius); - float angleRad = Angle(Point3f(0,0,1),norm); - Point3f axis = Point3f(0,0,1)^norm; + MeshType::ScalarType angleRad = Angle(MeshType::CoordType(0,0,1),norm); + MeshType::CoordType axis = MeshType::CoordType(0,0,1)^norm; - Matrix44f rotM; + Matrix44 rotM; rotM.SetRotateRad(angleRad,axis); tri::UpdatePosition::Matrix(m,rotM); tri::UpdatePosition::Translate(m,center); diff --git a/vcg/complex/algorithms/refine.h b/vcg/complex/algorithms/refine.h index 6bf57be3..cdfb3cf5 100644 --- a/vcg/complex/algorithms/refine.h +++ b/vcg/complex/algorithms/refine.h @@ -32,6 +32,7 @@ #include #include #include +#include #include namespace vcg{ diff --git a/vcg/complex/algorithms/update/selection.h b/vcg/complex/algorithms/update/selection.h index 78f431c6..6cf06f4c 100644 --- a/vcg/complex/algorithms/update/selection.h +++ b/vcg/complex/algorithms/update/selection.h @@ -330,7 +330,8 @@ static size_t FaceFromVertexLoose(MeshType &m) { bool selVert=false; for(int i = 0; i < (*fi).VN(); ++i) - if((*fi).V(i)->IsS()) selVert=true; + if((*fi).V(i)->IsS()) + selVert=true; if(selVert) { (*fi).SetS(); diff --git a/vcg/complex/append.h b/vcg/complex/append.h index 2c3c7373..248782c1 100644 --- a/vcg/complex/append.h +++ b/vcg/complex/append.h @@ -247,7 +247,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false, for(EdgeIteratorRight ei=mr.edge.begin(); ei!=mr.edge.end(); ++ei) if(!(*ei).IsD() && (!selected || (*ei).IsS())){ size_t ind=Index(mr,*ei); - remap.edge[ind]=Index(ml,*ep); + remap.edge[ind]=int(Index(ml,*ep)); ++ep; } @@ -261,7 +261,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false, for(FaceIteratorRight fi=mr.face.begin(); fi!=mr.face.end(); ++fi) if(!(*fi).IsD() && (!selected || (*fi).IsS())){ size_t ind=Index(mr,*fi); - remap.face[ind]=Index(ml,*fp); + remap.face[ind]=int(Index(ml,*fp)); ++fp; } diff --git a/vcg/complex/base.h b/vcg/complex/base.h index 400fa404..827e0597 100644 --- a/vcg/complex/base.h +++ b/vcg/complex/base.h @@ -38,7 +38,7 @@ public: int n_attr; // unique ID of the attribute - void Resize(const int & sz){((SimpleTempDataBase *)_handle)->Resize(sz);} + void Resize(size_t sz){((SimpleTempDataBase *)_handle)->Resize(sz);} void Reorder(std::vector & newVertIndex){((SimpleTempDataBase *)_handle)->Reorder(newVertIndex);} bool operator<(const PointerToAttribute b) const { return(_name.empty()&&b._name.empty())?(_handle < b._handle):( _name < b._name);} };