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

y axis reverse in projecting (!)

This commit is contained in:
ganovelli 2004-10-07 14:22:38 +00:00
parent 5e15dc4a97
commit 30c9628f43
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vcg/math/camera.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/10/05 19:04:25 ganovelli
version 5-10-2004 in progress
Revision 1.1 2004/09/15 22:58:05 ganovelli Revision 1.1 2004/09/15 22:58:05 ganovelli
re-creation re-creation
@ -46,9 +49,6 @@ creation
// opengl // opengl
#include <GL/glew.h> #include <GL/glew.h>
// TMP
#include <qmessagebox.h>
namespace vcg{ namespace vcg{
template<class S> template<class S>
@ -84,25 +84,13 @@ public:
/// project a point from space 3d (in the reference system of the camera) to the camera's plane /// project a point from space 3d (in the reference system of the camera) to the camera's plane
/// the result is in absolute coordinates /// the result is in absolute coordinates
inline vcg::Point2<S> Project(const vcg::Point3<S> & p); inline vcg::Point2<S> Project(const vcg::Point3<S> & p);
/// return the projection matrix for opengl
/// inline vcg::Matrix44<S> MatrixGL(S,vcg::Matrix44<S> &);
/// apply opengl transformation
/// inline void TransformGL(S far) const;
}; };
template<class S> template<class S>
vcg::Point2<S> Camera<S>::Project(const vcg::Point3<S> & p){ vcg::Point2<S> Camera<S>::Project(const vcg::Point3<S> & p){
::QMessageBox mb;
char t[200];
sprintf(t,"%f %f %f",p[0],p[1],p[2]);
mb.setText(t);
mb.exec();
S tx = p.X(); S tx = p.X();
S ty = -p.Y(); S ty = p.Y();
S qx,qy; S qx,qy;
vcg::Point2<S> q; vcg::Point2<S> q;
// nota: per le camere ortogonali viewportM vale 1 // nota: per le camere ortogonali viewportM vale 1
@ -111,6 +99,8 @@ vcg::Point2<S> Camera<S>::Project(const vcg::Point3<S> & p){
tx *= f/p.Z(); tx *= f/p.Z();
ty *= f/p.Z(); ty *= f/p.Z();
qx = tx;
qy = ty;
//undistorted_to_distorted_sensor_coord(tx,ty,qx,qy); //undistorted_to_distorted_sensor_coord(tx,ty,qx,qy);
q[0] = qx/s.X()+c.X(); q[0] = qx/s.X()+c.X();
@ -121,10 +111,6 @@ vcg::Point2<S> Camera<S>::Project(const vcg::Point3<S> & p){
q[0] = tx/(s.X()*viewportM)+c.X(); q[0] = tx/(s.X()*viewportM)+c.X();
q[1] = ty/(s.Y()*viewportM)+c.Y(); q[1] = ty/(s.Y()*viewportM)+c.Y();
} }
sprintf(t,"%f %f",q[0],q[1]);
mb.setText(t);
mb.exec();
return q; return q;
} }