diff --git a/EGkGeoObj.h b/EGkGeoObj.h index 69503cd..e8b7e5d 100644 --- a/EGkGeoObj.h +++ b/EGkGeoObj.h @@ -44,7 +44,7 @@ class __declspec( novtable) IGeoObj virtual bool Translate( const Vector3d& vtMove) = 0 ; virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ; virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngRad) = 0 ; - virtual bool Scale( const Point3d& ptCen, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; + virtual bool Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; virtual bool Mirror( const Point3d& ptOn, const Vector3d& vtNorm) = 0 ; virtual bool ToGlob( const Frame3d& frRef) = 0 ; virtual bool ToLoc( const Frame3d& frRef) = 0 ; diff --git a/EGkGeomDB.h b/EGkGeomDB.h index a47b9b5..dd795bd 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -51,7 +51,7 @@ class __declspec( novtable) IGeomDB virtual bool Translate( int nId, const Vector3d& vtMove) = 0 ; virtual bool Rotate( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ; virtual bool Rotate( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) = 0 ; - virtual bool Scale( int nId, const Point3d& ptCen, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; + virtual bool Scale( int nId, const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; virtual bool Mirror( int nId, const Point3d& ptOn, const Vector3d& vtNorm) = 0 ; } ; diff --git a/EGkPoint3d.h b/EGkPoint3d.h index df930aa..0f737ac 100644 --- a/EGkPoint3d.h +++ b/EGkPoint3d.h @@ -54,7 +54,7 @@ class EGK_EXPORT Point3d void Translate( const Vector3d& vtMove) ; bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngRad) ; bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) ; - bool Scale( const Point3d& ptCen, double dCoeffX, double dCoeffY, double dCoeffZ) ; + bool Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) ; bool Mirror( const Point3d& ptOn, const Vector3d& vtNorm) ; bool ToGlob( const Frame3d& frRef) ; bool ToLoc( const Frame3d& frRef) ; diff --git a/EGkVector3d.h b/EGkVector3d.h index 06fb8e5..2b1b8d1 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -74,7 +74,7 @@ class EGK_EXPORT Vector3d bool Normalize( void) ; bool Rotate( const Vector3d& vtAx, double dAngRad) ; bool Rotate( const Vector3d& vtAx, double dCosAng, double dSinAng) ; - bool Scale( double dCoeffX, double dCoeffY, double dCoeffZ) ; + bool Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) ; bool Mirror( const Vector3d& vtNorm) ; bool ToGlob( const Frame3d& frRef) ; bool ToLoc( const Frame3d& frRef) ; diff --git a/EgtPerfCounter.h b/EgtPerfCounter.h index 158cf47..8b0085b 100644 --- a/EgtPerfCounter.h +++ b/EgtPerfCounter.h @@ -22,7 +22,8 @@ class PerformanceCounter PerformanceCounter( void) { QueryPerformanceFrequency( (LARGE_INTEGER*) &m_lnFreq) ; if ( m_lnFreq <= 0) - m_lnFreq = 1 ; } + m_lnFreq = 1 ; + Start() ; } void Start( void) { QueryPerformanceCounter( (LARGE_INTEGER*) &m_lnStart) ; } double Stop( void)