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

changed from classes to functions

This commit is contained in:
ganovelli 2004-10-05 19:04:45 +00:00
parent 4a28f05056
commit 33a8e77c07
2 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wrap/gl/camera.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1 2004/09/15 22:59:13 ganovelli
creation
Revision 1.2 2004/09/06 21:41:30 ganovelli Revision 1.2 2004/09/06 21:41:30 ganovelli
*** empty log message *** *** empty log message ***
@ -34,39 +37,21 @@ creation
#ifndef __GL_CAMERA #ifndef __GL_CAMERA
#define __GL_CAMERA #define __GL_CAMERA
#include <QMessageBox.h>
// VCG // VCG
#include <vcg/math/camera.h> #include <vcg/math/camera.h>
// opengl // opengl
#include <GL/glew.h> #include <GL/glew.h>
template<class CameraType> template<class CameraType>
class GlCamera vcg::Matrix44<typename CameraType::ScalarType>
{ MatrixGL(const CameraType & cam, typename CameraType::ScalarType far,vcg::Matrix44<typename CameraType::ScalarType> &m){
public:
typedef CameraType::ScalarType ScalarType;
GlCamera(CameraType & c):camera(c){}
CameraType & camera;
public:
/// return the projection matrix for opengl
inline vcg::Matrix44<ScalarType> MatrixGL(ScalarType,vcg::Matrix44<ScalarType> &);
/// return the projection matrix for opengl
inline void TransformGL(CameraType::ScalarType far) const;
};
template<class CameraType>
vcg::Matrix44<CameraType::ScalarType> GlCamera<CameraType>::MatrixGL(CameraType::ScalarType far,vcg::Matrix44<CameraType::ScalarType> &m){
glPushAttrib(GL_TRANSFORM_BIT); glPushAttrib(GL_TRANSFORM_BIT);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
camera.TransformGL(far); cam.TransformGL(far);
glGetv(GL_PROJECTION_MATRIX,&m[0][0]); glGetv(GL_PROJECTION_MATRIX,&m[0][0]);
glPopMatrix(); glPopMatrix();
glPopAttrib(); glPopAttrib();
@ -74,12 +59,26 @@ vcg::Matrix44<CameraType::ScalarType> GlCamera<CameraType>::MatrixGL(CameraType:
} }
template<class CameraType> template<class CameraType>
void GlCamera<CameraType>::TransformGL(CameraType::ScalarType farDist) const{ void TransformGL(const CameraType & camera,typename CameraType::ScalarType farDist) {
/////////////////// METTERE IL FRUSTUM GIUSTO ////////////////////// /////////////////// METTERE IL FRUSTUM GIUSTO //////////////////////
//glFrustum(1,10,2,20,1,20); //glFrustum(1,10,2,20,1,20);
typedef typename CameraType::ScalarType S;
S sx,dx,bt,tp,nr,fr;
dx = -camera.c.X()*camera.s.X();
sx = ( camera.viewport.X() - camera.c.X() ) * camera.s.X();
bt = -camera.c.Y()*camera.s.Y();
tp = ( camera.viewport.Y() - camera.c.Y() ) * camera.s.Y();
nr = camera.f;
fr = farDist; // tmp
assert(glGetError()==0);
glFrustum(dx,sx,bt,tp,nr,fr);
assert(glGetError()==0);
} }
#endif #endif

68
wrap/gl/shot.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1 2004/09/15 22:59:13 ganovelli
creation
Revision 1.2 2004/09/06 21:41:30 ganovelli Revision 1.2 2004/09/06 21:41:30 ganovelli
*** empty log message *** *** empty log message ***
@ -47,70 +50,59 @@ creation
#include <wrap/gl/camera.h> #include <wrap/gl/camera.h>
#include <dbgUti.h> #include <dbgUti.h>
template <class ShotType>
class GlShot {
public:
typedef typename ShotType::ScalarType ScalarType;
GlCamera<ShotType::CameraType> & glCamera; // the camera that shot
ShotType &shot;
GlShot(ShotType &s):shot(s),glCamera(GlCamera<ShotType::CameraType> (s.camera) ){}
void MatrixGL(vcg::Matrix44<ScalarType> & m) const;
vcg::Point3<ScalarType>const & GlShot<ShotType>::ViewPoint();
/// apply the modelview transformation
void TransformGL() const;
/// Set opengl projection and model matrix pushing them onto the stack (to use with PopView()
void SetView();
void UnsetView();
}; // end class definition
template<class ShotType> template<class ShotType>
void GlShot<ShotType>::MatrixGL(vcg::Matrix44<ScalarType> & m) const{ void MatrixGL(const ShotType & shot,vcg::Matrix44<typename ShotType::ScalarType> & m) {
m = shot.similarity.Matrix(); m = shot.similarity.Matrix();
} }
template<class ShotType> template<class ShotType>
void GlShot<ShotType>::TransformGL()const{ void TransformGL(const ShotType & shot){
vcg::Matrix44<ScalarType> m; vcg::Matrix44<typename ShotType::ScalarType> m;
MatrixGL(m); MatrixGL(shot,m);
glMultMatrix(m); glMultMatrix(m);
} }
template <class ShotType> template <class ShotType>
void GlShot<ShotType>::SetView(){ void SetView(const ShotType & shot){
assert(glGetError() == 0);
glPushAttrib(GL_TRANSFORM_BIT); glPushAttrib(GL_TRANSFORM_BIT);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
assert(glGetError() == 0);
OutMatrix("mat.txt","a+"); OutMatrix("mat.txt","a+");
glCamera.TransformGL(1.f); assert(glGetError() == 0);
TransformGL(shot.camera,1.f);
assert(glGetError() == 0);
OutMatrix("mat.txt","a+"); OutMatrix("mat.txt","a+");
assert(glGetError() == 0);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
vcg::Matrix44<ScalarType> m; vcg::Matrix44<typename ShotType::ScalarType> m;
TransformGL(); TransformGL(shot);
glPopAttrib();
assert(glGetError() == 0);
} }
template <class ShotType> #define UnsetView()\
void GlShot<ShotType>::UnsetView(){ glPushAttrib(GL_TRANSFORM_BIT);\
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);\
glPopMatrix(); glPopMatrix();\
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);\
glPopMatrix(); glPopMatrix();\
glPopAttrib(); glPopAttrib();\
}
#endif #endif