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

chenged the name of the component RT in the vertex definition (it has chenged to edgeplane) 

Corrected GetClosest (to compile with gcc)
This commit is contained in:
ganovelli 2008-09-30 10:12:51 +00:00
parent 0468bab362
commit a73a806d8b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/sample/aabb_binary_tree/aabb_binary_tree.cpp
View File

@ -27,8 +27,8 @@ using namespace vcg;
class AEdge; class AEdge;
class AFace; class AFace;
class AVertex : public VertexSimp2< AVertex, AEdge, AFace, vert::Normal3f, vert::Coord3f >{}; class AVertex : public VertexSimp2< AVertex, AEdge, AFace, vert::Normal3f, vert::Coord3f,vert::BitFlags >{};
class AFace : public FaceSimp2< AVertex, AEdge, AFace, face::VertexRef, face::Normal3f, face::RTInfo, face::BitFlags> {}; class AFace : public FaceSimp2< AVertex, AEdge, AFace, face::VertexRef, face::Normal3f, face::EdgePlane, face::BitFlags> {};
//class AVertex : public vcg::Vertex< AScalarType, AEdge, AFace > { }; //class AVertex : public vcg::Vertex< AScalarType, AEdge, AFace > { };
//class AFace : public vcg::FaceRTFMFN< AVertex, AEdge, AFace > { }; //class AFace : public vcg::FaceRTFMFN< AVertex, AEdge, AFace > { };
@ -53,8 +53,7 @@ static void SetIndex(void) {
} }
static void TestClosest(void) { static void TestClosest(void) {
vcg::face::PointDistanceFunctor getPtDist; vcg::face::PointDistanceFunctor<AIndex::ScalarType> getPtDist;
const AIndex::ScalarType x = 0;
const AIndex::CoordType queryPoint((AIndex::ScalarType)0, (AIndex::ScalarType)0, (AIndex::ScalarType)0); const AIndex::CoordType queryPoint((AIndex::ScalarType)0, (AIndex::ScalarType)0, (AIndex::ScalarType)0);
const AIndex::ScalarType maxDist = std::numeric_limits<AIndex::ScalarType>::max(); const AIndex::ScalarType maxDist = std::numeric_limits<AIndex::ScalarType>::max();
@ -62,7 +61,8 @@ static void TestClosest(void) {
AIndex::ScalarType closestDist; AIndex::ScalarType closestDist;
AIndex::CoordType closestPoint; AIndex::CoordType closestPoint;
closestFace = gIndex.GetClosest(getPtDist, vcg::EmptyClass(), queryPoint, maxDist, closestDist, closestPoint); vcg::EmptyClass a;
closestFace = gIndex.GetClosest(getPtDist, a, queryPoint, maxDist, closestDist, closestPoint);
printf("GetClosest Test:\n"); printf("GetClosest Test:\n");
@ -77,7 +77,7 @@ static void TestClosest(void) {
} }
static void TestKClosest(void) { static void TestKClosest(void) {
vcg::face::PointDistanceFunctor getPtDist; vcg::face::PointDistanceFunctor<AIndex::ScalarType> getPtDist;
const unsigned int k = 10; const unsigned int k = 10;
const AIndex::CoordType queryPoint((AIndex::ScalarType)0, (AIndex::ScalarType)0, (AIndex::ScalarType)0); const AIndex::CoordType queryPoint((AIndex::ScalarType)0, (AIndex::ScalarType)0, (AIndex::ScalarType)0);
const AIndex::ScalarType maxDist = std::numeric_limits<AIndex::ScalarType>::max(); const AIndex::ScalarType maxDist = std::numeric_limits<AIndex::ScalarType>::max();
@ -86,7 +86,8 @@ static void TestKClosest(void) {
std::vector<AIndex::ScalarType> closestDistances; std::vector<AIndex::ScalarType> closestDistances;
std::vector<AIndex::CoordType> closestPoints; std::vector<AIndex::CoordType> closestPoints;
unsigned int rk = gIndex.GetKClosest(getPtDist, vcg::EmptyClass(), k, queryPoint, maxDist, closestObjects, closestDistances, closestPoints); vcg::EmptyClass a;
unsigned int rk = gIndex.GetKClosest(getPtDist, a, k, queryPoint, maxDist, closestObjects, closestDistances, closestPoints);
printf("GetKClosest Test:\n"); printf("GetKClosest Test:\n");
printf("\tfound %d objects\n", rk); printf("\tfound %d objects\n", rk);
@ -105,7 +106,8 @@ static void TestRay(void) {
AIndex::ScalarType rayT; AIndex::ScalarType rayT;
AIndex::CoordType isectPt; AIndex::CoordType isectPt;
isectFace = gIndex.DoRay(rayIntersector, vcg::EmptyClass(), ray, maxDist, rayT); vcg::EmptyClass a;
isectFace = gIndex.DoRay(rayIntersector, a , ray, maxDist, rayT);
printf("DoRay Test:\n"); printf("DoRay Test:\n");
if (isectFace != 0) { if (isectFace != 0) {