diff --git a/OffsetCurve.cpp b/OffsetCurve.cpp index c5a6cb7..b52168a 100644 --- a/OffsetCurve.cpp +++ b/OffsetCurve.cpp @@ -60,8 +60,8 @@ OffsetCurve::Reset( void) } } m_CrvLst.clear() ; - m_pt = P_INVALID ; - m_vt = V_INVALID ; + m_ptOffs = P_INVALID ; + m_vtOut = V_INVALID ; return true ; } @@ -714,8 +714,8 @@ OffsetCurve::Make( const ICurve* pCrv, double dDist, int nType) // ( e.g. alcune curve aperte) non se ne restiusce nessuno. Da estendere, se necessario, individuando i punti dal lato // di offset richiesto if ( vPntOffs.size() == 1) { - m_pt = vPntOffs[0].first ; - m_vt = vPntOffs[0].second ; + m_ptOffs = vPntOffs[0].first ; + m_vtOut = vPntOffs[0].second ; } } } @@ -747,20 +747,20 @@ OffsetCurve::Make( const ICurve* pCrv, double dDist, int nType) pCrv->Scale( GLOB_FRM, 1 / dExtrOnN, 1, 1) ; pCrv->ToGlob( frCopy) ; } - if ( m_pt.IsValid()) { - m_pt.Scale( GLOB_FRM, 1 / dExtrOnN, 1, 1) ; - m_pt.ToGlob( frCopy) ; - m_vt.Scale( GLOB_FRM, 1 / dExtrOnN, 1, 1) ; - m_vt.ToGlob( frCopy) ; + if ( m_ptOffs.IsValid()) { + m_ptOffs.Scale( GLOB_FRM, 1 / dExtrOnN, 1, 1) ; + m_ptOffs.ToGlob( frCopy) ; + m_vtOut.Scale( GLOB_FRM, 1 / dExtrOnN, 1, 1) ; + m_vtOut.ToGlob( frCopy) ; } } else if ( bNeedRef) { for ( auto pCrv : m_CrvLst) pCrv->ToGlob( frCopy) ; - if ( m_pt.IsValid()) { - m_pt.ToGlob( frCopy) ; - m_vt.ToGlob( frCopy) ; + if ( m_ptOffs.IsValid()) { + m_ptOffs.ToGlob( frCopy) ; + m_vtOut.ToGlob( frCopy) ; } } @@ -841,14 +841,14 @@ OffsetCurve::GetShorterCurve( void) //---------------------------------------------------------------------------- bool -OffsetCurve::GetPointOffset( Point3d& pt, Vector3d& vt) +OffsetCurve::GetPointOffset( Point3d& ptOffs, Vector3d& vtOut) { // verifico se valori validi da restituire - if ( ! m_pt.IsValid() || ! m_vt.IsValid()) + if ( ! m_ptOffs.IsValid() || ! m_vtOut.IsValid()) return false ; - pt = m_pt ; - vt = m_vt ; + ptOffs = m_ptOffs ; + vtOut = m_vtOut ; return true ; }