From 2a52c8ae8cbed56fb25afdb786c70b54f365157b Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Thu, 23 Nov 2017 19:14:02 +0100 Subject: [PATCH] thomas minor changes and fixes --- vcg/complex/algorithms/curve_on_manifold.h | 7 +++++++ vcg/space/box3.h | 1 + wrap/io_trimesh/import_ply.h | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h index 4415ad83..c791667e 100644 --- a/vcg/complex/algorithms/curve_on_manifold.h +++ b/vcg/complex/algorithms/curve_on_manifold.h @@ -129,6 +129,13 @@ public: return vcg::tri::GetClosestFaceBase(base,uniformGrid,p, this->par.gridBailout, closestDist, closestP,closestN,ip); } + FaceType *GetClosestFaceIP(const CoordType &p, CoordType &ip, CoordType &in) + { + ScalarType closestDist; + CoordType closestP; + return vcg::tri::GetClosestFaceBase(base,uniformGrid,p, this->par.gridBailout, closestDist, closestP,in,ip); + } + FaceType *GetClosestFacePoint(const CoordType &p, CoordType &closestP) { ScalarType closestDist; diff --git a/vcg/space/box3.h b/vcg/space/box3.h index f9e3fccd..69906ce5 100644 --- a/vcg/space/box3.h +++ b/vcg/space/box3.h @@ -323,6 +323,7 @@ void Add( const Point3 & p, const BoxScalarType radius ) template Box3 Point3::GetBBox(Box3 &bb) const { bb.Set( *this ); + return bb; } diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h index 52f4463a..a37e9240 100644 --- a/wrap/io_trimesh/import_ply.h +++ b/wrap/io_trimesh/import_ply.h @@ -115,7 +115,7 @@ struct LoadPly_VertAux S p[3]; S n[3]; int flags; - float q; // the confidence + S q; // the confidence float intensity; unsigned char r; unsigned char g; @@ -189,7 +189,7 @@ static const PropDescriptor &VertDesc(int i) /*27*/ {"vertex", "nx", ply::T_DOUBLE, PlyType(),offsetof(LoadPly_VertAux,n) ,0,0,0,0,0 ,0}, /*28*/ {"vertex", "ny", ply::T_DOUBLE, PlyType(),offsetof(LoadPly_VertAux,n) + 1*sizeof(ScalarType),0,0,0,0,0 ,0}, /*29*/ {"vertex", "nz", ply::T_DOUBLE, PlyType(),offsetof(LoadPly_VertAux,n) + 2*sizeof(ScalarType),0,0,0,0,0 ,0}, -/*30*/ {"vertex", "radius", ply::T_DOUBLE, ply::T_FLOAT, offsetof(LoadPly_VertAux,radius),0,0,0,0,0 ,0}, +/*30*/ {"vertex", "radius", ply::T_DOUBLE, PlyType(),offsetof(LoadPly_VertAux,radius),0,0,0,0,0 ,0}, /*31*/ {"vertex", "quality", ply::T_DOUBLE, PlyType(),offsetof(LoadPly_VertAux,q),0,0,0,0,0 ,0} }; return pv[i];