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

added import in the importdata members to support of different types of curvature (float/double)

This commit is contained in:
Paolo Cignoni 2014-07-12 21:09:27 +00:00
parent 88a648822a
commit 76b91b9957
2 changed files with 6 additions and 6 deletions
vcg/simplex
face
component_ocf.h
vertex
component_ocf.h

4
vcg/simplex/face/component_ocf.h
View File

@ -524,8 +524,8 @@ public:
template <class RightFaceType> template <class RightFaceType>
void ImportData(const RightFaceType & rightF){ void ImportData(const RightFaceType & rightF){
if((*this).IsCurvatureDirEnabled() && rightF.IsCurvatureDirEnabled()) { if((*this).IsCurvatureDirEnabled() && rightF.IsCurvatureDirEnabled()) {
PD1() = rightF.cPD1(); PD1().Import(rightF.cPD1());
PD2() = rightF.cPD2(); PD2().Import(rightF.cPD2());
K1() = rightF.cK1(); K1() = rightF.cK1();
K2() = rightF.cK2(); K2() = rightF.cK2();
} }

8
vcg/simplex/vertex/component_ocf.h
View File

@ -486,10 +486,10 @@ public:
void ImportData(const RightVertexType & rightV){ void ImportData(const RightVertexType & rightV){
if((*this).IsCurvatureDirEnabled() && rightV.IsCurvatureDirEnabled()) if((*this).IsCurvatureDirEnabled() && rightV.IsCurvatureDirEnabled())
{ {
(*this).PD1() = rightV.cPD1(); (*this).PD1().Import(rightV.cPD1());
(*this).PD2() = rightV.cPD2(); (*this).PD2().Import(rightV.cPD2());
(*this).K1() = rightV.cK1(); (*this).K1()=rightV.cK1();
(*this).K2() = rightV.cK2(); (*this).K2()=rightV.cK2();
} }
TT::ImportData(rightV); TT::ImportData(rightV);
} }