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

complex/base.h: 

- removed Visual Studio warnings
This commit is contained in:
granzuglia 2014-08-09 10:01:15 +00:00
parent 8cebfaf679
commit b5bfb0e438
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -871,10 +871,10 @@ void OrientedDisk(MeshType &m, int slices, typename MeshType::CoordType center,
{ {
Disk(m,slices); Disk(m,slices);
tri::UpdatePosition<MeshType>::Scale(m,radius); tri::UpdatePosition<MeshType>::Scale(m,radius);
float angleRad = Angle(Point3f(0,0,1),norm); MeshType::ScalarType angleRad = Angle(MeshType::CoordType(0,0,1),norm);
Point3f axis = Point3f(0,0,1)^norm; MeshType::CoordType axis = MeshType::CoordType(0,0,1)^norm;
Matrix44f rotM; Matrix44<MeshType::ScalarType> rotM;
rotM.SetRotateRad(angleRad,axis); rotM.SetRotateRad(angleRad,axis);
tri::UpdatePosition<MeshType>::Matrix(m,rotM); tri::UpdatePosition<MeshType>::Matrix(m,rotM);
tri::UpdatePosition<MeshType>::Translate(m,center); tri::UpdatePosition<MeshType>::Translate(m,center);

1
vcg/complex/algorithms/refine.h
View File

@ -32,6 +32,7 @@
#include <vcg/simplex/face/topology.h> #include <vcg/simplex/face/topology.h>
#include <vcg/complex/algorithms/update/topology.h> #include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/flag.h> #include <vcg/complex/algorithms/update/flag.h>
#include <vcg/space/texcoord2.h>
#include <vcg/space/triangle3.h> #include <vcg/space/triangle3.h>
namespace vcg{ namespace vcg{

3
vcg/complex/algorithms/update/selection.h
View File

@ -330,7 +330,8 @@ static size_t FaceFromVertexLoose(MeshType &m)
{ {
bool selVert=false; bool selVert=false;
for(int i = 0; i < (*fi).VN(); ++i) for(int i = 0; i < (*fi).VN(); ++i)
if((*fi).V(i)->IsS()) selVert=true; if((*fi).V(i)->IsS())
selVert=true;
if(selVert) { if(selVert) {
(*fi).SetS(); (*fi).SetS();

4
vcg/complex/append.h
View File

@ -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) for(EdgeIteratorRight ei=mr.edge.begin(); ei!=mr.edge.end(); ++ei)
if(!(*ei).IsD() && (!selected || (*ei).IsS())){ if(!(*ei).IsD() && (!selected || (*ei).IsS())){
size_t ind=Index(mr,*ei); size_t ind=Index(mr,*ei);
remap.edge[ind]=Index(ml,*ep); remap.edge[ind]=int(Index(ml,*ep));
++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) for(FaceIteratorRight fi=mr.face.begin(); fi!=mr.face.end(); ++fi)
if(!(*fi).IsD() && (!selected || (*fi).IsS())){ if(!(*fi).IsD() && (!selected || (*fi).IsS())){
size_t ind=Index(mr,*fi); size_t ind=Index(mr,*fi);
remap.face[ind]=Index(ml,*fp); remap.face[ind]=int(Index(ml,*fp));
++fp; ++fp;
} }

2
vcg/complex/base.h
View File

@ -38,7 +38,7 @@ public:
int n_attr; // unique ID of the attribute 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<size_t> & newVertIndex){((SimpleTempDataBase *)_handle)->Reorder(newVertIndex);} void Reorder(std::vector<size_t> & newVertIndex){((SimpleTempDataBase *)_handle)->Reorder(newVertIndex);}
bool operator<(const PointerToAttribute b) const { return(_name.empty()&&b._name.empty())?(_handle < b._handle):( _name < b._name);} bool operator<(const PointerToAttribute b) const { return(_name.empty()&&b._name.empty())?(_handle < b._handle):( _name < b._name);}
}; };