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

Corrected a syntax error detected only by gcc. 

Corrected the order of initialization in the constructor to match the declaration order
This commit is contained in:
Paolo Cignoni 2006-12-21 00:13:27 +00:00
parent 8403681640
commit 01695ba1d5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/math/camera.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.27 2006/12/18 16:02:55 matteodelle
minor eroor correction on variable names
Revision 1.26 2006/12/18 09:46:38 callieri Revision 1.26 2006/12/18 09:46:38 callieri
camera+shot revamp: changed field names to something with more sense, cleaning of various functions, correction of minor bugs/incongruences, removal of the infamous reference in shot. camera+shot revamp: changed field names to something with more sense, cleaning of various functions, correction of minor bugs/incongruences, removal of the infamous reference in shot.
@ -138,10 +141,11 @@ public:
typedef S ScalarType; typedef S ScalarType;
Camera(): Camera():
FocalMm(0.f),PixelSizeMm(vcg::Point2<S>(0.0,0.0)), FocalMm(0.f),
ViewportPx(vcg::Point2<int>(0,0)),
PixelSizeMm(vcg::Point2<S>(0.0,0.0)),
CenterPx(vcg::Point2<S>(0.0,0.0)), CenterPx(vcg::Point2<S>(0.0,0.0)),
DistorCenterPx(vcg::Point2<S>(0.0,0.0)), DistorCenterPx(vcg::Point2<S>(0.0,0.0)),
ViewportPx(vcg::Point2<int>(0,0)),
cameraType(0) cameraType(0)
{} {}
@ -160,7 +164,7 @@ public:
void SetOrtho(S dist) void SetOrtho(S dist)
{ {
cameraType = ORTHO; cameraType = ORTHO;
ViewportPx = ( ((ViewportPx[0] * PixelSizeMm[0]) * (ViewportPx[1] * PixelSizeMm[1])) / f ) * dist; ViewportPx = ( ((ViewportPx[0] * PixelSizeMm[0]) * (ViewportPx[1] * PixelSizeMm[1])) / FocalMm ) * dist;
}; };
bool IsOrtho() const bool IsOrtho() const