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

Corrected HasPerFaceColor and HasPerWedgeTexture to comply gcc

This commit is contained in:
Paolo Cignoni 2006-01-03 10:54:21 +00:00
parent 1c29faf575
commit dda2cfbcaa
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vcg/simplex/faceplus/component_ocf.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.6 2005/12/12 11:17:32 cignoni
Corrected update function, now only the needed simplexes should be updated.
Revision 1.5 2005/11/26 00:16:44 cignoni Revision 1.5 2005/11/26 00:16:44 cignoni
Corrected a lot of bugs about the use of enabled entities Corrected a lot of bugs about the use of enabled entities
@ -361,15 +364,15 @@ public:
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType >
bool HasPerWedgeTexture (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerWedgeTexture (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m)
{ {
if(FaceContainerType::HasWedgeTextureOcf()) return m.face.WedgeTexEnabled(); if(face::vector_ocf< FaceType >::HasWedgeTextureOcf()) return m.face.WedgeTexEnabled();
else return FaceContainerType::HasWedgeTexture(); else return face::vector_ocf< FaceType > >::HasWedgeTexture();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType >
bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m)
{ {
if(FaceContainerType::HasPerFaceColorOcf()) return m.face.FaceColor(); if(face::vector_ocf< FaceType >::HasPerFaceColorOcf()) return m.face.FaceColor();
else return FaceContainerType::HasFaceColor(); else return face::vector_ocf< FaceType > > ::HasFaceColor();
} }
} }
}// end namespace vcg }// end namespace vcg