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

fix some bugs

This commit is contained in:
Paolo Cignoni 2006-01-04 16:39:29 +00:00
parent 0e28dcfe31
commit 20b3385c59
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wrap/gl/pick.h
View File

@ -41,7 +41,7 @@ class GLPickTri
public: public:
static bool PickNearestFace(int x, int y, MESH_TYPE &m, FaceIterator &fi,int width=4, int height=4) static bool PickNearestFace(int x, int y, MESH_TYPE &m, FacePointer &fi,int width=4, int height=4)
{ {
std::vector<FacePointer> result; std::vector<FacePointer> result;
int val=PickFace(x,y,m,result,width,height); int val=PickFace(x,y,m,result,width,height);
@ -50,7 +50,7 @@ public:
fi=result[0]; fi=result[0];
return true; return true;
} }
fi=0; fi=NULL;
return false; return false;
} }
@ -109,14 +109,14 @@ public:
//xstring buf; //xstring buf;
//if (hits <= 0) return 0; //if (hits <= 0) return 0;
std::vector< std::pair<double,unsigned int> > H; std::vector< std::pair<double,unsigned int> > H;
for(int ii=0;ii<hits;ii++){ for(long ii=0;ii<hits;ii++){
//TRACE("%ui %ui %ui %ui\n",selectBuf[ii*4],selectBuf[ii*4+1],selectBuf[ii*4+2],selectBuf[ii*4+3]); //TRACE("%ui %ui %ui %ui\n",selectBuf[ii*4],selectBuf[ii*4+1],selectBuf[ii*4+2],selectBuf[ii*4+3]);
H.push_back( std::pair<double,unsigned int>(selectBuf[ii*4+1]/4294967295.0,selectBuf[ii*4+3])); H.push_back( std::pair<double,unsigned int>(selectBuf[ii*4+1]/4294967295.0,selectBuf[ii*4+3]));
} }
std::sort(H.begin(),H.end()); std::sort(H.begin(),H.end());
// if(H.size()>0) TRACE("\n Closest is %i\n",H[0].second); // if(H.size()>0) TRACE("\n Closest is %i\n",H[0].second);
result.resize(H.size()); result.resize(H.size());
for(ii=0;ii<hits;ii++){ for(long ii=0;ii<hits;ii++){
FaceIterator fi=m.face.begin(); FaceIterator fi=m.face.begin();
advance(fi ,H[ii].second); advance(fi ,H[ii].second);
result[ii]=&*fi; result[ii]=&*fi;