diff --git a/wrap/gl/camera.h b/wrap/gl/camera.h index aef50124..31d376ed 100644 --- a/wrap/gl/camera.h +++ b/wrap/gl/camera.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log: not supported by cvs2svn $ +Revision 1.7 2005/02/21 18:11:47 ganovelli +GetFrustum moved from gl/camera to math/camera.h + Revision 1.6 2004/12/16 14:41:36 ricciodimare *** empty log message *** @@ -59,7 +62,7 @@ struct GlCamera{ typedef typename CameraType::ScalarType S; static vcg::Matrix44 -MatrixGL(const vcg::Camera & cam, vcg::Matrix44 &m){ +MatrixGL(vcg::Camera & cam, vcg::Matrix44 &m){ glPushAttrib(GL_TRANSFORM_BIT); glMatrixMode(GL_PROJECTION); glPushMatrix(); @@ -71,12 +74,12 @@ MatrixGL(const vcg::Camera & cam, vcg::Matrix44 &m){ return m; } -static void GetFrustum(const CameraType & camera,typename S & sx,typename S & dx,typename S & bt, typename S & tp,typename S & f ,typename S & fr) +static void GetFrustum(vcg::Camera & camera, S & sx,S & dx,S & bt,S & tp,S & f ,S & fr) { camera.GetFrustum(sx,dx,bt,tp,f,fr); } -static void TransformGL(vcg::Camera & camera,typename S farDist = -1 ) { +static void TransformGL(vcg::Camera & camera, S farDist = -1 ) { S sx,dx,bt,tp,nr,fr; GetFrustum(camera,sx,dx,bt,tp,nr,fr); assert(glGetError()==0); @@ -87,14 +90,14 @@ static void TransformGL(vcg::Camera & camera,typename S farDist = -1 ) { assert(glGetError()==0); }; -static void GetViewSize(const vcg::Camera & camera, typename S &width, typename S &height) { +static void GetViewSize(vcg::Camera & camera, S &width, S &height) { S sx,dx,bt,tp,nr,fr; GetFrustum(camera,sx,dx,bt,tp,nr,fr); width = dx-sx; //right - left = width height = tp-bt; //top - bottom = height }; -static void SetSubView(const CameraType & camera,vcg::Point2 p0,vcg::Point2 p1){ +static void SetSubView(vcg::Camera & camera,vcg::Point2 p0,vcg::Point2 p1){ //typedef typename CameraType::ScalarType S; S sx,dx,bt,tp,nr,fr; GetFrustum(camera,sx,dx,bt,tp,nr,fr);