From cd277247ccdac370555137081e40a2171fce549f Mon Sep 17 00:00:00 2001 From: matteodelle Date: Wed, 10 Jan 2007 17:25:18 +0000 Subject: [PATCH] *** empty log message *** --- vcg/complex/trimesh/update/normal.h | 5 ++++- vcg/math/camera.h | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/vcg/complex/trimesh/update/normal.h b/vcg/complex/trimesh/update/normal.h index 9a784826..cc334ec8 100644 --- a/vcg/complex/trimesh/update/normal.h +++ b/vcg/complex/trimesh/update/normal.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.12 2006/11/07 15:13:56 zifnab1974 +Necessary changes for compilation with gcc 3.4.6. Especially the hash function is a problem + Revision 1.11 2005/12/06 18:22:31 pietroni changed FaceType::ComputeNormal and FaceType::ComputeNormalizedNormal with face::ComputeNormal and face::ComputeNormalizedNormal @@ -102,7 +105,7 @@ static void PerFace(ComputeMeshType &m) if( !m.HasPerFaceNormal()) return; FaceIterator f; for(f=m.face.begin();f!=m.face.end();++f) - if( !(*f).IsD() ) /*face::*/ComputeNormal(*f); + if( !(*f).IsD() ) face::ComputeNormal(*f); } diff --git a/vcg/math/camera.h b/vcg/math/camera.h index aefc81fa..e152f78a 100644 --- a/vcg/math/camera.h +++ b/vcg/math/camera.h @@ -23,6 +23,10 @@ /**************************************************************************** History $Log: not supported by cvs2svn $ +Revision 1.28 2006/12/21 00:13:27 cignoni +Corrected a syntax error detected only by gcc. +Corrected the order of initialization in the constructor to match the declaration order + Revision 1.27 2006/12/18 16:02:55 matteodelle minor eroor correction on variable names @@ -309,9 +313,9 @@ void Camera::SetFrustum( S sx, S dx, S bt, S tp, S Focal, vcg::Point2 Vi vp[0] = dx-sx; vp[1] = tp-bt; - ViewportPx[0] = vp[0]; + ViewportPx[0] = Viewport[0]; if(vp[1] != -1) - ViewportPx[1] = vp[1]; // the user specified the viewport + ViewportPx[1] = Viewport[1]; // the user specified the viewport else ViewportPx[1] = ViewportPx[0]; // default viewport