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

Fixed viewport<->window coordinate change for the z. (z = 2*z -1 now) 

Accordingly to gluUnproject documentation.
This commit is contained in:
Federico Ponchio 2005-10-15 15:23:32 +00:00
parent f5a490079f
commit 16eafff705
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wrap/gui/view.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.13 2005/02/11 11:53:18 tommyfranken
changed pointf to point<t> in ViewLineFromWindow
Revision 1.12 2005/02/10 20:09:11 tarini Revision 1.12 2005/02/10 20:09:11 tarini
dispelled the mega-evil of GL_TRANSPOSE_*_MATRIX_ARB dispelled the mega-evil of GL_TRANSPOSE_*_MATRIX_ARB
@ -210,7 +213,7 @@ template <class T> Point3<T> View<T>::NormDevCoordToWindowCoord(const Point3<T>
a[0] = (p[0]+1)*(viewport[2]/(T)2.0)+viewport[0]; a[0] = (p[0]+1)*(viewport[2]/(T)2.0)+viewport[0];
a[1] = (p[1]+1)*(viewport[3]/(T)2.0)+viewport[1]; a[1] = (p[1]+1)*(viewport[3]/(T)2.0)+viewport[1];
//a[1] = viewport[3] - a[1]; //a[1] = viewport[3] - a[1];
a[2] = p[2]; a[2] = (p[2]+1)/2;
return a; return a;
} }
@ -220,7 +223,7 @@ template <class T> Point3<T> View<T>::WindowCoordToNormDevCoord(const Point3<T>
a[0] = (p[0]- viewport[0])/ (viewport[2]/(T)2.0) - 1; a[0] = (p[0]- viewport[0])/ (viewport[2]/(T)2.0) - 1;
a[1] = (p[1]- viewport[1])/ (viewport[3]/(T)2.0) - 1; a[1] = (p[1]- viewport[1])/ (viewport[3]/(T)2.0) - 1;
//a[1] = -a[1]; //a[1] = -a[1];
a[2] = p[2]; a[2] = 2*p[2] - 1;
return a; return a;
} }