From 76b91b9957fe69a36b948c811039110276b6d0c5 Mon Sep 17 00:00:00 2001 From: cignoni Date: Sat, 12 Jul 2014 21:09:27 +0000 Subject: [PATCH] added import in the importdata members to support of different types of curvature (float/double) --- vcg/simplex/face/component_ocf.h | 4 ++-- vcg/simplex/vertex/component_ocf.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vcg/simplex/face/component_ocf.h b/vcg/simplex/face/component_ocf.h index 98d07fac..58b8b92a 100644 --- a/vcg/simplex/face/component_ocf.h +++ b/vcg/simplex/face/component_ocf.h @@ -524,8 +524,8 @@ public: template void ImportData(const RightFaceType & rightF){ if((*this).IsCurvatureDirEnabled() && rightF.IsCurvatureDirEnabled()) { - PD1() = rightF.cPD1(); - PD2() = rightF.cPD2(); + PD1().Import(rightF.cPD1()); + PD2().Import(rightF.cPD2()); K1() = rightF.cK1(); K2() = rightF.cK2(); } diff --git a/vcg/simplex/vertex/component_ocf.h b/vcg/simplex/vertex/component_ocf.h index 8de4c32b..00c53d62 100644 --- a/vcg/simplex/vertex/component_ocf.h +++ b/vcg/simplex/vertex/component_ocf.h @@ -486,10 +486,10 @@ public: void ImportData(const RightVertexType & rightV){ if((*this).IsCurvatureDirEnabled() && rightV.IsCurvatureDirEnabled()) { - (*this).PD1() = rightV.cPD1(); - (*this).PD2() = rightV.cPD2(); - (*this).K1() = rightV.cK1(); - (*this).K2() = rightV.cK2(); + (*this).PD1().Import(rightV.cPD1()); + (*this).PD2().Import(rightV.cPD2()); + (*this).K1()=rightV.cK1(); + (*this).K2()=rightV.cK2(); } TT::ImportData(rightV); }