diff --git a/EGkBBox3d.h b/EGkBBox3d.h index 50708b1..7048369 100644 --- a/EGkBBox3d.h +++ b/EGkBBox3d.h @@ -69,6 +69,9 @@ class EGK_EXPORT BBox3d bool GetCenterExtent( Point3d& ptCenter, Vector3d& vtExtent) const ; bool GetCenter( Point3d& ptCenter) const ; bool GetRadius( double& dRad) const ; + void Translate( const Vector3d& vtMove) ; + bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) ; + bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) ; bool ToGlob( const Frame3d& frRef) ; bool ToLoc( const Frame3d& frRef) ; bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) ; diff --git a/EGnLuaAux.h b/EGnLuaAux.h index 3b6be7b..1f3f5a2 100644 --- a/EGnLuaAux.h +++ b/EGnLuaAux.h @@ -17,7 +17,6 @@ //---------------------------------------------------------------------------- #define LuaCheckParam(L,I,P) { if ( ! LuaGetParam(L,I,P)) return luaL_error( L, " Invalid Parameter # " #I) ;} -#define LuaCheckParamDef(L,I,P,D) { if ( ! LuaGetParam(L,I,P)) (P) = (D) ; } //---------------------------------------------------------------------------- inline bool diff --git a/EInAPI.h b/EInAPI.h index f23226a..19bed4c 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -197,10 +197,11 @@ EIN_EXPORT int __stdcall EgtGetCurrPart( void) ; EIN_EXPORT int __stdcall EgtGetCurrLayer( void) ; EIN_EXPORT BOOL __stdcall EgtSetCurrPartLayer( int nPartId, int nLayerId) ; EIN_EXPORT BOOL __stdcall EgtResetCurrPartLayer( void) ; -EIN_EXPORT int __stdcall EgtGetFirstVisiblePart( void) ; -EIN_EXPORT int __stdcall EgtGetNextVisiblePart( int nId) ; -EIN_EXPORT int __stdcall EgtGetFirstVisibleLayer( int nPartId) ; -EIN_EXPORT int __stdcall EgtGetNextVisibleLayer( int nId) ; +EIN_EXPORT int __stdcall EgtGetPartNbr( bool bOnlyVisible) ; +EIN_EXPORT int __stdcall EgtGetFirstPart( bool bOnlyVisible) ; +EIN_EXPORT int __stdcall EgtGetNextPart( int nId, bool bOnlyVisible) ; +EIN_EXPORT int __stdcall EgtGetFirstLayer( int nPartId, bool bOnlyVisible) ; +EIN_EXPORT int __stdcall EgtGetNextLayer( int nId, bool bOnlyVisible) ; EIN_EXPORT BOOL __stdcall EgtSelectPartObjs( int nPartId) ; EIN_EXPORT BOOL __stdcall EgtDeselectPartObjs( int nPartId) ; EIN_EXPORT BOOL __stdcall EgtSelectLayerObjs( int nLayerId) ; @@ -500,6 +501,8 @@ EIN_EXPORT BOOL __stdcall EgtFrameToLoc( double ptOrig[3], double vtX[3], double EIN_EXPORT BOOL __stdcall EgtFrameLocToLoc( double ptOrig[3], double vtX[3], double vtY[3], double vtZ[3], const double ptO1[3], const double vtX1[3], const double vtY1[3], const double vtZ1[3], const double ptO2[3], const double vtX2[3], const double vtY2[3], const double vtZ2[3]) ; +EIN_EXPORT BOOL __stdcall EgtBBoxRotate( double ptMin[3], double ptMax[3], + const double ptAx[3], const double vtAx[3], double dAngRotDeg) ; EIN_EXPORT BOOL __stdcall EgtBBoxToGlob( double ptMin[3], double ptMax[3], const double ptO1[3], const double vtX1[3], const double vtY1[3], const double vtZ1[3]) ; EIN_EXPORT BOOL __stdcall EgtBBoxToLoc( double ptMin[3], double ptMax[3], diff --git a/EInConst.h b/EInConst.h index db9756e..f46876b 100644 --- a/EInConst.h +++ b/EInConst.h @@ -22,6 +22,6 @@ enum EinSep { SEP_STD = 0, //----------------- Costanti tipo di riferimento di input ---------------------- enum RefType{ RTY_GLOB = 0, - RTY_LOC = 1, - RTY_GRID = 2} ; + RTY_GRID = -3, // come GDB_ID_GRID + RTY_LOC = -4} ; const int RTY_DEFAULT = RTY_LOC ; \ No newline at end of file diff --git a/EMkMachMgr.h b/EMkMachMgr.h index d8f78dc..c192559 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -27,12 +27,12 @@ class __declspec( novtable) IMachMgr { public : - // General + // Basic virtual ~IMachMgr( void) {} virtual bool Init( IGeomDB* pGeomDB) = 0 ; virtual bool Update( void) = 0 ; virtual bool Insert( int nInsGrp) = 0 ; - // MachGroup + // MachGroups virtual int GetMachGroupNbr( void) const = 0 ; virtual int GetFirstMachGroup( void) const = 0 ; virtual int GetNextMachGroup( int nId) const = 0 ; @@ -44,17 +44,24 @@ class __declspec( novtable) IMachMgr virtual bool SetCurrMachGroup( int nId) = 0 ; virtual bool ResetCurrMachGroup( void) = 0 ; virtual int GetCurrMachGroup( void) const = 0 ; - // RawPart & Part + // RawParts + virtual int GetRawPartNbr( void) const = 0 ; + virtual int GetFirstRawPart( void) const = 0 ; + virtual int GetNextRawPart( int nId) const = 0 ; virtual int AddRawPart( const Point3d& ptOrig, double dWidth, double dLen, double dHeight, Color cCol) = 0 ; virtual int AddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, Color cCol) = 0 ; - virtual bool AddPartToRawPart( int nPartId, const Point3d& ptPos, int nRawId) = 0 ; virtual bool ModifyRawPartHeight( int nRawId, double dHeight) = 0 ; virtual bool RemoveRawPart( int nRawId) = 0 ; virtual bool TranslateRawPart( int nRawId, const Vector3d& vtMove) = 0 ; virtual bool RotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; virtual bool MoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) = 0 ; virtual bool MoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) = 0 ; - virtual bool RemovePartFromRawPart( int nPartId) ; + // Parts + virtual int GetPartInRawPartNbr( int nRawId) const = 0 ; + virtual int GetFirstPartInRawPart( int nRawId) const = 0 ; + virtual int GetNextPartInRawPart( int nId) const = 0 ; + virtual bool AddPartToRawPart( int nPartId, const Point3d& ptPos, int nRawId) = 0 ; + virtual bool RemovePartFromRawPart( int nPartId) = 0 ; virtual bool TranslatePartInRawPart( int nPartId, const Vector3d& vtMove) = 0 ; virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; } ;