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

made public some functions in glPick to ease glu replacement...

This commit is contained in:
Paolo Cignoni 2017-01-26 12:22:59 +01:00
parent 3a6c2879cd
commit 607ffe778f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wrap/gl/pick.h
View File

@ -41,9 +41,8 @@ class GLPickTri
typedef typename MESH_TYPE::VertexPointer VertexPointer; typedef typename MESH_TYPE::VertexPointer VertexPointer;
typedef typename MESH_TYPE::VertexType VertexType; typedef typename MESH_TYPE::VertexType VertexType;
private: public:
static CoordType glProject(const Eigen::Matrix<ScalarType,4,4> &M, const ScalarType * viewport, const CoordType &p)
static CoordType Proj(const Eigen::Matrix<ScalarType,4,4> &M, const ScalarType * viewport, const CoordType &p)
{ {
const ScalarType vx=viewport[0]; const ScalarType vx=viewport[0];
const ScalarType vy=viewport[1]; const ScalarType vy=viewport[1];
@ -67,7 +66,7 @@ private:
pVec.resize(m.vert.size()); pVec.resize(m.vert.size());
for(size_t i=0;i<m.vert.size();++i) if(!m.vert[i].IsD()) for(size_t i=0;i<m.vert.size();++i) if(!m.vert[i].IsD())
{ {
pVec[i] = Proj(M, viewportF,CoordType::Construct(m.vert[i].P())); pVec[i] = GLPickTri<MESH_TYPE>::glProject(M, viewportF,CoordType::Construct(m.vert[i].P()));
} }
} }
@ -227,7 +226,7 @@ public:
ScalarType LocalEpsilon(0.001); ScalarType LocalEpsilon(0.001);
for(size_t i =0;i<result.size();++i) for(size_t i =0;i<result.size();++i)
{ {
CoordType p = Proj(M,vp,CoordType::Construct(Barycenter(*(result[i])))) ; CoordType p = glProject(M,vp,CoordType::Construct(Barycenter(*(result[i])))) ;
if(p[0] >=0 && p[0]<screenW && p[1] >=0 && p[1]<screenH) if(p[0] >=0 && p[0]<screenW && p[1] >=0 && p[1]<screenH)
{ {
ScalarType bufZ(buffer[int(p[0])+int(p[1])*screenW]); ScalarType bufZ(buffer[int(p[0])+int(p[1])*screenW]);