Egalware/Include
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include : modifiche per CreateGeoObj con parametro nType.

Browse Source
This commit is contained in:
Dario Sassi
2013-11-26 20:55:03 +00:00
parent fd3238f092
commit b0496d7bae
8 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EGkGeoObj.h
+2 -2
View File
@@ -34,7 +34,7 @@ class _declspec( novtable) IGeoObj
virtual ~IGeoObj( void) {}
virtual IGeoObj* Clone( void) const = 0 ;
virtual GeoObjType GetType( void) const = 0 ;
virtual std::string GetKey( void) const = 0 ;
virtual const std::string& GetKey( void) const = 0 ;
virtual bool IsValid( void) const = 0 ;
virtual bool Save( std::ostream& osOut) const = 0 ;
virtual bool Load( CScan& TheScanner) = 0 ;
@@ -48,4 +48,4 @@ class _declspec( novtable) IGeoObj
} ;
//-----------------------------------------------------------------------------
EGK_EXPORT IGeoObj* CreateGeoObj( std::string sKey) ;
EGK_EXPORT IGeoObj* CreateGeoObj( int nType) ;
EGkGeoObjType.h
-9
View File
@@ -28,12 +28,3 @@ enum GeoObjType { GEO_NONE = 0,
CRV_BEZ = ( GEO_CURVE + 2),
CRV_COMPO = ( GEO_CURVE + 3),
SRF_TRIMESH = ( GEO_SURF + 0)} ;
//----------------- Costanti chiavi oggetto geometrico ------------------------
static const char* KEY_GEO_VECT3D = "G_VEC" ;
static const char* KEY_GEO_PNT3D = "G_PNT" ;
static const char* KEY_CRV_LINE = "C_LIN" ;
static const char* KEY_CRV_ARC = "C_ARC" ;
static const char* KEY_CRV_BEZ = "C_BEZ" ;
static const char* KEY_CRV_COMPO = "C_CMP" ;
static const char* KEY_SRF_TRIMESH = "S_TRM" ;
EGkGeoPoint3d.h
+1 -1
View File
@@ -25,7 +25,7 @@ class _declspec( novtable) IGeoPoint3d : public IGeoObj
//-----------------------------------------------------------------------------
inline IGeoPoint3d* CreateGeoPoint3d( void)
{ return (static_cast<IGeoPoint3d*>( CreateGeoObj( KEY_GEO_PNT3D))) ; }
{ return (static_cast<IGeoPoint3d*>( CreateGeoObj( GEO_PNT3D))) ; }
inline IGeoPoint3d* CloneGeoPoint3d( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != GEO_PNT3D)
return nullptr ;
EGkGeoVector3d.h
+1 -1
View File
@@ -25,7 +25,7 @@ class _declspec( novtable) IGeoVector3d : public IGeoObj
//-----------------------------------------------------------------------------
inline IGeoVector3d* CreateGeoVector3d( void)
{ return (static_cast<IGeoVector3d*>( CreateGeoObj( KEY_GEO_VECT3D))) ; }
{ return (static_cast<IGeoVector3d*>( CreateGeoObj( GEO_VECT3D))) ; }
inline IGeoVector3d* CloneGeoVector3d( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != GEO_VECT3D)
return nullptr ;
EgkCurveArc.h
+1 -1
View File
@@ -34,7 +34,7 @@ class _declspec( novtable) ICurveArc : public ICurve
//-----------------------------------------------------------------------------
inline ICurveArc* CreateCurveArc( void)
{ return (static_cast<ICurveArc*>( CreateGeoObj( KEY_CRV_ARC))) ; }
{ return (static_cast<ICurveArc*>( CreateGeoObj( CRV_ARC))) ; }
inline ICurveArc* CloneCurveArc( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != CRV_ARC)
return nullptr ;
EgkCurveBezier.h
+1 -1
View File
@@ -30,7 +30,7 @@ class _declspec( novtable) ICurveBezier : public ICurve
//-----------------------------------------------------------------------------
inline ICurveBezier* CreateCurveBezier( void)
{ return (static_cast<ICurveBezier*>( CreateGeoObj( KEY_CRV_BEZ))) ; }
{ return (static_cast<ICurveBezier*>( CreateGeoObj( CRV_BEZ))) ; }
inline ICurveBezier* CloneCurveBezier( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != CRV_BEZ)
return nullptr ;
EgkCurveComposite.h
+1 -1
View File
@@ -28,7 +28,7 @@ class _declspec( novtable) ICurveComposite : public ICurve
//-----------------------------------------------------------------------------
inline ICurveComposite* CreateCurveComposite( void)
{ return (static_cast<ICurveComposite*>( CreateGeoObj( KEY_CRV_COMPO))) ; }
{ return (static_cast<ICurveComposite*>( CreateGeoObj( CRV_COMPO))) ; }
inline ICurveComposite* CloneCurveComposite( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != CRV_COMPO)
return nullptr ;
EgkCurveLine.h
+1 -1
View File
@@ -26,7 +26,7 @@ class _declspec( novtable) ICurveLine : public ICurve
//-----------------------------------------------------------------------------
inline ICurveLine* CreateCurveLine( void)
{ return (static_cast<ICurveLine*>( CreateGeoObj( KEY_CRV_LINE))) ; }
{ return (static_cast<ICurveLine*>( CreateGeoObj( CRV_LINE))) ; }
inline ICurveLine* CloneCurveLine( const IGeoObj* pGObj)
{ if ( pGObj == nullptr || pGObj->GetType() != CRV_LINE)
return nullptr ;