From 4bf2b3df453fa331443d3c7abadc73a98da5e70b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 23 Jan 2014 14:52:20 +0000 Subject: [PATCH] Include : modifiche alle dichiarazioni. --- EGkGeoConst.h | 9 --------- EGkPoint3d.h | 12 ++++++++++++ EgkCurveComposite.h | 2 ++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/EGkGeoConst.h b/EGkGeoConst.h index 1059f07..d2e339f 100644 --- a/EGkGeoConst.h +++ b/EGkGeoConst.h @@ -38,12 +38,3 @@ const double SIN_EPS_ANG_SMALL = EPS_ANG_SMALL * DEGTORAD ; const double SIN_EPS_ANG_ZERO = EPS_ANG_ZERO * DEGTORAD ; const double COS_ORTO_ANG_SMALL = SIN_EPS_ANG_SMALL ; const double COS_ORTO_ANG_ZERO = SIN_EPS_ANG_ZERO ; - -// tolleranza lineare minima in approssimazioni lineari -const double LIN_TOL_MIN = 0.01 ; -// deviazione angolare minima (in gradi) in approssimazioni lineari -const double ANG_TOL_MIN_DEG = 0.1 ; -// tolleranza lineare standard in approssimazioni lineari -static const double LIN_TOL_APPROX = 1 ; -// deviazione angolare standard (in gradi) in approssimazioni lineari -static const double ANG_TOL_APPROX_DEG = 45 ; diff --git a/EGkPoint3d.h b/EGkPoint3d.h index 0f737ac..7cb1c24 100644 --- a/EGkPoint3d.h +++ b/EGkPoint3d.h @@ -134,6 +134,18 @@ operator*( double dMul, const Point3d& ptP) return Point3d( ptP.x * dMul, ptP.y * dMul, ptP.z * dMul) ; } +//---------------------------------------------------------------------------- +// Divisione per uno scalare +//---------------------------------------------------------------------------- +inline Point3d +operator/( const Point3d& ptP, double dDiv) +{ + double dMul ; + + dMul = 1 / dDiv ; + return ( Point3d( ptP.x * dMul, ptP.y * dMul, ptP.z * dMul)) ; +} + //---------------------------------------------------------------------------- // Somma mediata di due punti (baricentrica) //---------------------------------------------------------------------------- diff --git a/EgkCurveComposite.h b/EgkCurveComposite.h index 2998821..1f59564 100644 --- a/EgkCurveComposite.h +++ b/EgkCurveComposite.h @@ -21,10 +21,12 @@ class __declspec( novtable) ICurveComposite : public ICurve public : virtual bool Clear( void) = 0 ; virtual bool AddCurve( const ICurve& cCrv) = 0 ; + virtual bool FromSplit( const ICurve& cCrv, int nParts) = 0 ; virtual int GetCurveNumber( void) const = 0 ; virtual const ICurve* GetFirstCurve( void) const = 0 ; virtual const ICurve* GetNextCurve( void) const = 0 ; virtual bool IsParamAtJoint( double dU) const = 0 ; + virtual bool ArcsToBezierCurves( void) = 0 ; } ; //-----------------------------------------------------------------------------