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

Updated HasPerFaceColor/Quality to the new style with mesh param.

This commit is contained in:
Paolo Cignoni 2006-05-25 04:40:57 +00:00
parent 9ced8993e3
commit 8be82261cf
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/complex/trimesh/append.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2006/04/11 13:51:21 zifnab1974
commented out one function which does not compile on linux with gcc 3.4.5
Revision 1.3 2006/01/30 09:00:40 cignoni Revision 1.3 2006/01/30 09:00:40 cignoni
Corrected use of HasPerWedgeTexture Corrected use of HasPerWedgeTexture
@ -88,8 +91,8 @@ static void ImportFace(MeshLeft &ml, MeshRight &mr, FaceLeft &fl, FaceRight &fr,
fl.V(0)=&ml.vert[remap[ Index(mr,fr.V(0))]]; fl.V(0)=&ml.vert[remap[ Index(mr,fr.V(0))]];
fl.V(1)=&ml.vert[remap[ Index(mr,fr.V(1))]]; fl.V(1)=&ml.vert[remap[ Index(mr,fr.V(1))]];
fl.V(2)=&ml.vert[remap[ Index(mr,fr.V(2))]]; fl.V(2)=&ml.vert[remap[ Index(mr,fr.V(2))]];
if(fl.HasFaceColor() && fl.HasFaceColor()) fl.C()=fr.C(); if(HasPerFaceColor(mr) && HasPerFaceColor(ml)) fl.C()=fr.C();
if(fl.HasFaceQuality() && fl.HasFaceQuality()) fl.Q()=fr.Q(); if(HasPerFaceQuality(mr) && HasPerFaceQuality(ml)) fl.Q()=fr.Q();
if(HasPerWedgeTexture(mr) && HasPerWedgeTexture(ml)) if(HasPerWedgeTexture(mr) && HasPerWedgeTexture(ml))
{ {
fl.WT(0)=fr.WT(0); fl.WT(0)=fr.WT(0);

6
vcg/complex/trimesh/base.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.20 2006/05/03 21:35:31 cignoni
Added new style HasPerFaceColor(m) and HasPerFaceMark(m)
Revision 1.19 2005/12/02 00:05:34 cignoni Revision 1.19 2005/12/02 00:05:34 cignoni
Added HasFlags and a couple of missing include files Added HasFlags and a couple of missing include files
@ -316,6 +319,9 @@ bool HasPerFaceColor (const TriMesh < VertContainerType , FaceContainerType> & /
template < class VertContainerType, class FaceContainerType > template < class VertContainerType, class FaceContainerType >
bool HasPerFaceMark (const TriMesh < VertContainerType , FaceContainerType> & /*m*/) {return FaceContainerType::value_type::HasMark();} bool HasPerFaceMark (const TriMesh < VertContainerType , FaceContainerType> & /*m*/) {return FaceContainerType::value_type::HasMark();}
template < class VertContainerType, class FaceContainerType >
bool HasPerFaceQuality (const TriMesh < VertContainerType , FaceContainerType> & /*m*/) {return FaceContainerType::value_type::HasFaceQuality();}
/*@}*/ /*@}*/
/*@}*/ /*@}*/
} // end namespace } // end namespace