From 45583a69ae1e7c9555414c94e0cb787d6f4acbf4 Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Mon, 24 Oct 2005 14:42:57 +0000 Subject: [PATCH] add namespace vcg:: to GetFrustum(...) --- wrap/gl/camera.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/wrap/gl/camera.h b/wrap/gl/camera.h index 841e1851..04aa0860 100644 --- a/wrap/gl/camera.h +++ b/wrap/gl/camera.h @@ -23,6 +23,15 @@ /**************************************************************************** History $Log: not supported by cvs2svn $ +Revision 1.9 2005/06/29 15:02:29 spinelli +aggiunto: +- static void CavalieriProj( .. ) +- static void IsometricProj( .. ) + +modificato: +- static void TransformGL( .. ) +- static void SetSubView( .. ) + Revision 1.8 2005/02/22 10:57:05 tommyfranken corrected some syntax errors in GetFrustum @@ -122,10 +131,10 @@ static void TransformGL(vcg::Camera & camera, S farDist = -1 ) { assert(glGetError()==0); switch(camera.cameraType) { - case PERSPECTIVE: glFrustum(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; - case ORTHO: glOrtho(sx*camera.viewportM,dx*camera.viewportM,bt*camera.viewportM,tp*camera.viewportM,nr,(farDist == -1)?fr:farDist); break; - case ISOMETRIC: IsometricProj(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; - case CAVALIERI: CavalieriProj(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; + case vcg::PERSPECTIVE: glFrustum(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; + case vcg::ORTHO: glOrtho(sx*camera.viewportM,dx*camera.viewportM,bt*camera.viewportM,tp*camera.viewportM,nr,(farDist == -1)?fr:farDist); break; + case vcg::ISOMETRIC: IsometricProj(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; + case vcg::CAVALIERI: CavalieriProj(sx,dx,bt,tp,nr,(farDist == -1)?fr:farDist); break; } /* if(!camera.IsOrtho()) {