Merge branch 'devel' of https://github.com/cnr-isti-vclab/vcglib into devel
This commit is contained in:
commit
d6e5aa2116
|
@ -1369,7 +1369,7 @@ public:
|
|||
count = 0;
|
||||
|
||||
ScalarType NormalThrRad = math::ToRad(normalThresholdDeg);
|
||||
ScalarType eps = 0.0001; // this epsilon value is in absolute value. It is a distance from edge in baricentric coords.
|
||||
ScalarType eps = ScalarType(0.0001); // this epsilon value is in absolute value. It is a distance from edge in baricentric coords.
|
||||
//detection stage
|
||||
for(FaceIterator fi=m.face.begin();fi!= m.face.end();++fi ) if(!(*fi).IsV())
|
||||
{ Point3<ScalarType> NN = vcg::TriangleNormal((*fi)).Normalize();
|
||||
|
|
|
@ -179,7 +179,7 @@ public:
|
|||
this->optimalPos = newPos;
|
||||
}
|
||||
|
||||
void Execute(TriMeshType &m, BaseParameterClass */*_pp*/)
|
||||
void Execute(TriMeshType &m, BaseParameterClass * /*_pp*/)
|
||||
{
|
||||
CoordType newPos = this->optimalPos;
|
||||
QH::Qd(this->pos.V(1))+=QH::Qd(this->pos.V(0)); // v0 is deleted and v1 take the new position
|
||||
|
|
|
@ -92,7 +92,7 @@ static void UniformCone(int vn, std::vector<Point3<ScalarType > > &NN, ScalarTyp
|
|||
|
||||
printf("----------AngleRad %f Angledeg %f ratio %f vn %i vn2 %i \n",AngleRad,math::ToDeg(AngleRad),Ratio,vn,int(vn/Ratio));
|
||||
Fibonacci(vn/Ratio,NNT);
|
||||
printf("asked %i got %i (expecting %i instead of %i)\n", int(vn/Ratio), NNT.size(), int(NNT.size()*Ratio), vn);
|
||||
printf("asked %i got %i (expecting %i instead of %i)\n", int(vn/Ratio), int(NNT.size()), int(NNT.size()*Ratio), vn);
|
||||
typename std::vector<Point3<ScalarType> >::iterator vi;
|
||||
|
||||
ScalarType cosAngle = cos(AngleRad);
|
||||
|
|
|
@ -65,7 +65,7 @@ namespace vcg {
|
|||
typedef typename SaveMeshType::FaceIterator FaceIterator;
|
||||
|
||||
///Standard call for saving a mesh
|
||||
static int Save(SaveMeshType &m, const char * filename, const int &mask, CallBackPos */*cb=0*/)
|
||||
static int Save(SaveMeshType &m, const char * filename, const int &mask, CallBackPos * /*cb=0*/)
|
||||
{
|
||||
FILE *fp;
|
||||
fp = fopen(filename,"wb");
|
||||
|
|
|
@ -87,7 +87,7 @@ static const char* ErrorMsg(int error)
|
|||
};
|
||||
|
||||
|
||||
static int Open( OpenMeshType &m, const char * filename, int &loadmask, CallBackPos */*cb*/=0)
|
||||
static int Open( OpenMeshType &m, const char * filename, int &loadmask, CallBackPos * /*cb*/=0)
|
||||
{
|
||||
CTMcontext context;
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
|
|||
shots[i].Intrinsics.FocalMm = f/100.0f;
|
||||
shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably
|
||||
shots[i].Intrinsics.k[1] = 0.0;//k2;
|
||||
shots[i].Intrinsics.PixelSizeMm = vcg::Point2<ScalarType>(0.01,0.01);
|
||||
shots[i].Intrinsics.PixelSizeMm = vcg::Point2<ScalarType>(ScalarType(0.01), ScalarType(0.01));
|
||||
QImageReader sizeImg(QString::fromStdString(image_filenames[i]));
|
||||
QSize size=sizeImg.size();
|
||||
shots[i].Intrinsics.ViewportPx = vcg::Point2i(size.width(),size.height());
|
||||
|
|
|
@ -76,7 +76,7 @@ public:
|
|||
elemDescVec[elemType]->push_back(PropDescriptor());
|
||||
elemNameVec[elemType]->push_back(attrName);
|
||||
elemDescVec[elemType]->back().elemname=elemStr[elemType];
|
||||
elemDescVec[elemType]->back().propname=propName;
|
||||
elemDescVec[elemType]->back().propname=strdup(propName);
|
||||
elemDescVec[elemType]->back().stotype1 = vcg::ply::T_FLOAT;
|
||||
elemDescVec[elemType]->back().memtype1 = vcg::ply::T_FLOAT;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue