diff options
| author | Brian Paul <[email protected]> | 2001-07-16 15:46:42 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-07-16 15:46:42 +0000 |
| commit | fba5e9546874e1e140a3862b31e35b68832cc22d (patch) | |
| tree | c540c6cee09570a153ee1e53e423fd0b27cbcba4 /src/glu/sgi/libutil | |
| parent | 96385fa15569e25cd0977e678c0ff3bdab6ef316 (diff) | |
assorted fixes for Win32 (Gerk Huisma)
Diffstat (limited to 'src/glu/sgi/libutil')
| -rw-r--r-- | src/glu/sgi/libutil/project.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glu/sgi/libutil/project.c b/src/glu/sgi/libutil/project.c index 9440f429da3..f67c8782f8b 100644 --- a/src/glu/sgi/libutil/project.c +++ b/src/glu/sgi/libutil/project.c @@ -31,8 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $ -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/project.c,v 1.1 2001/03/17 00:25:41 brianp Exp $ +** $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $ +** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/project.c,v 1.2 2001/07/16 15:46:42 brianp Exp $ */ #include "gluos.h" @@ -331,7 +331,7 @@ gluUnProject4(GLdouble winx, GLdouble winy, GLdouble winz, GLdouble clipw, const GLdouble modelMatrix[16], const GLdouble projMatrix[16], const GLint viewport[4], - GLclampd near, GLclampd far, + GLclampd near, GLclampd farVal, GLdouble *objx, GLdouble *objy, GLdouble *objz, GLdouble *objw) { @@ -350,7 +350,7 @@ gluUnProject4(GLdouble winx, GLdouble winy, GLdouble winz, GLdouble clipw, /* Map x and y from window coordinates */ in[0] = (in[0] - viewport[0]) / viewport[2]; in[1] = (in[1] - viewport[1]) / viewport[3]; - in[2] = (in[2] - near) / (far - near); + in[2] = (in[2] - near) / (farVal - near); /* Map to range -1 to 1 */ in[0] = in[0] * 2 - 1; |