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

*** empty log message ***

This commit is contained in:
matteodelle 2007-01-10 17:25:18 +00:00
parent 0c8a863586
commit cd277247cc
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vcg/complex/trimesh/update/normal.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $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 Revision 1.11 2005/12/06 18:22:31 pietroni
changed FaceType::ComputeNormal and FaceType::ComputeNormalizedNormal changed FaceType::ComputeNormal and FaceType::ComputeNormalizedNormal
with face::ComputeNormal and face::ComputeNormalizedNormal with face::ComputeNormal and face::ComputeNormalizedNormal
@ -102,7 +105,7 @@ static void PerFace(ComputeMeshType &m)
if( !m.HasPerFaceNormal()) return; if( !m.HasPerFaceNormal()) return;
FaceIterator f; FaceIterator f;
for(f=m.face.begin();f!=m.face.end();++f) for(f=m.face.begin();f!=m.face.end();++f)
if( !(*f).IsD() ) /*face::*/ComputeNormal(*f); if( !(*f).IsD() ) face::ComputeNormal(*f);
} }

8
vcg/math/camera.h
View File

@ -23,6 +23,10 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $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 Revision 1.27 2006/12/18 16:02:55 matteodelle
minor eroor correction on variable names minor eroor correction on variable names
@ -309,9 +313,9 @@ void Camera<S>::SetFrustum( S sx, S dx, S bt, S tp, S Focal, vcg::Point2<int> Vi
vp[0] = dx-sx; vp[0] = dx-sx;
vp[1] = tp-bt; vp[1] = tp-bt;
ViewportPx[0] = vp[0]; ViewportPx[0] = Viewport[0];
if(vp[1] != -1) if(vp[1] != -1)
ViewportPx[1] = vp[1]; // the user specified the viewport ViewportPx[1] = Viewport[1]; // the user specified the viewport
else else
ViewportPx[1] = ViewportPx[0]; // default viewport ViewportPx[1] = ViewportPx[0]; // default viewport