From a40c141f64326526bba7de6c8592f6c3b47fc2a2 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 6 Feb 2014 16:44:59 +0000 Subject: [PATCH] Include : aggiunto metodo a BBox3d e aggiunte costanti di base. --- EGkBBox3d.h | 5 +++++ EGkGeoConst.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/EGkBBox3d.h b/EGkBBox3d.h index efe3ee7..bf24751 100644 --- a/EGkBBox3d.h +++ b/EGkBBox3d.h @@ -32,6 +32,8 @@ class EGK_EXPORT BBox3d m_ptMax( -INFINITO, -INFINITO, -INFINITO) {} BBox3d( const Point3d ptP) : m_ptMin( ptP), m_ptMax( ptP) {} + BBox3d( double dX, double dY, double dZ) + : m_ptMin( dX, dY, dZ), m_ptMax( dX, dY, dZ) {} BBox3d( const Point3d ptP1, const Point3d ptP2) ; BBox3d( double dX1, double dY1, double dZ1, double dX2, double dY2, double dZ2) ; void Reset( void) @@ -39,6 +41,8 @@ class EGK_EXPORT BBox3d m_ptMax = Point3d( -INFINITO, -INFINITO, -INFINITO) ; } void Set( const Point3d ptP) { m_ptMin = ptP ; m_ptMax = ptP ; } + void Set( double dX, double dY, double dZ) + { m_ptMin = Point3d( dX, dY, dZ) ; m_ptMax = m_ptMin ; } void Set( const Point3d ptP1, const Point3d ptP2) ; void Set( double dX1, double dY1, double dZ1, double dX2, double dY2, double dZ2) ; @@ -46,6 +50,7 @@ class EGK_EXPORT BBox3d bool IsEmpty( void) const { return ( ! IsValid()) ; } void Add( const Point3d& ptP) ; + void Add( double dX, double dY, double dZ) ; void Add( const BBox3d& b3B) ; void Expand( double dDelta) ; void Expand( double dDeltaX, double dDeltaY, double dDeltaZ) ; diff --git a/EGkGeoConst.h b/EGkGeoConst.h index d2e339f..3e90033 100644 --- a/EGkGeoConst.h +++ b/EGkGeoConst.h @@ -27,7 +27,7 @@ const double EPS_ZERO = 1e-7 ; const double INFINITO = 1e10 ; // conversione da gradi a radianti e viceversa -const double PIGRECO = 3.14159265358979324 ; +const double PIGRECO = 3.14159265358979323846 ; const double DEGTORAD = PIGRECO / 180. ; const double RADTODEG = 180. / PIGRECO ; @@ -38,3 +38,9 @@ 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 ; + +// altre costanti +const double SQRT2 = 1.41421356237309504880 ; +const double SQRT1_2 = 1 / SQRT2 ; +const double SQRT3 = 1.73205080756887729353 ; +const double SQRT1_3 = 1 / SQRT3 ;