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

EgtExecutor 2.3h1 :

Browse Source 
- la versione x64 compilata con clang-cl
- migliorie e correzioni suggerite dal nuovo compilatore.
This commit is contained in:
DarioS
2021-08-01 10:54:29 +02:00
parent 67644cf6e2
commit e2b0a333da
16 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE_GdbCreateCurve.cpp
+3 -3
View File
@@ -243,7 +243,7 @@ CreateLinePointTgCurve( IGeomDB* pGeomDB, int nParentId,
// recupero la curva
const ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nIdF)) ;
if ( pCurve == nullptr)
return false ;
return nullptr ;
// calcolo la retta tangente alla curva
PtrOwner<ICurveLine> pCrvLine ;
pCrvLine.Set( GetLinePointTgCurve( ptSloc, *pCurve, ptNloc)) ;
@@ -359,7 +359,7 @@ CreateLineTgTwoCurves( IGeomDB* pGeomDB, int nParentId,
// recupero la seconda curva
const ICurve* pCrv2 = GetCurve( pGeomDB->GetGeoObj( nIdF)) ;
if ( pCrv2 == nullptr)
return false ;
return nullptr ;
// porto la seconda curva nel riferimento della prima
PtrOwner<ICurve> pCrv2Loc( pCrv2->Clone()) ;
if ( IsNull( pCrv2Loc))
@@ -2432,7 +2432,7 @@ CalcExtrusion( IGeomDB* pGeomDB, int nParentId, int nRefType)
// riferimento dell'entità
Frame3d frEnt ;
if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frEnt))
return false ;
return V_NULL ;
// versore estrusione
Vector3d vtExtr = Z_AX ;
if ( nRefType == RTY_GLOB)
EXE_GdbCreateSurf.cpp
-1
View File
@@ -278,7 +278,6 @@ MyCreateSurfFlatRegion( int nParentId, const INTVECTOR& vCrvIds, int* pnCount)
// costruisco la regione piana
SurfFlatRegionByContours SfrCntr ;
// creo le copie locali delle curve
bool bFirst = true ;
for ( size_t i = 0 ; i < vCrvIds.size() ; ++ i) {
int nId = (( vCrvIds[i] != GDB_ID_SEL) ? vCrvIds[i] : pGeomDB->GetFirstSelectedObj()) ;
while ( nId != GDB_ID_NULL) {
EXE_GdbGetSurf.cpp
+2 -2
View File
@@ -530,11 +530,11 @@ ExeSurfTmFacetOppositeSideEx( int nId, int nFacet, const Vector3d& vtDir, int nR
else
break ;
}
// elimino le curve estreme molto corte ( 0.1 mm)
// elimino le curve estreme molto corte ( 0.5 mm)
const double REF_LEN = 10.0 ;
double dCompoLen ;
if ( pCrvCompo->GetLength( dCompoLen) && dCompoLen > REF_LEN) {
const double MIN_LEN = 0.1 ;
const double MIN_LEN = 0.5 ;
double dCrvLen ;
pCrv = pCrvCompo->GetFirstCurve() ;
if ( pCrv != nullptr && pCrv->GetLength( dCrvLen) && dCrvLen < MIN_LEN)
EXE_GdbGetVol.cpp
+1 -1
View File
@@ -196,7 +196,7 @@ ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRef
Vector3d vtVL = GetVectorLocal( pGeomDB, vtDir, nRefType, frLoc) ;
// recupero lo Zmap e calcolo profondità
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bOk = bOk && ( pVZM != nullptr && pVZM->GetDepth( ptP, vtDir, dInLen, dOutLen, bExact)) ;
bOk = bOk && ( pVZM != nullptr && pVZM->GetDepth( ptPL, vtVL, dInLen, dOutLen, bExact)) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
EXE_GdbModifyCurve.cpp
+1 -2
View File
@@ -1772,7 +1772,7 @@ ExeMoveCurveCompoCurve( int nId, int nCrv, const Vector3d& vtMove, int nRefType)
// porto in locale il movimento
Vector3d vtMoveL = GetVectorLocal( pGeomDB, vtMove, nRefType, frLoc) ;
// eseguo la modifica
bOk = bOk && pCompo->MoveCurve( nCrv, vtMove) ;
bOk = bOk && pCompo->MoveCurve( nCrv, vtMoveL) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -1962,7 +1962,6 @@ MyChainCurvesInGroup( int nGroupId, const Point3d& ptNear, bool bAllowInvert, in
nId = pGeomDB->GetNext( nId) ;
}
// recupero i percorsi concatenati
int nFirstId = GDB_ID_NULL ;
Point3d ptNearL = GetPointLocal( pGeomDB, ptNear, nRefType, frGrp) ;
INTVECTOR vId2s ;
while ( chainC.GetChainFromNear( ptNearL, false, vId2s)) {
EXE_GdbPartLayers.cpp
-2
View File
@@ -193,7 +193,6 @@ ExeResetCurrPartLayer( void)
{
GseContext* pGseCtx = GetCurrGseContext() ;
VERIFY_CTX_GEOMDB( pGseCtx, false)
IGeomDB* pGeomDB = pGseCtx->m_pGeomDB ;
// reset
pGseCtx->m_nCurrPart = GDB_ID_NULL ;
pGseCtx->m_nCurrLayer = GDB_ID_NULL ;
@@ -600,7 +599,6 @@ ExeSelectPathObjs( int nId, bool bHaltOnFork)
}
}
// recupero il primo percorso concatenato
int nFirstId = GDB_ID_NULL ;
INTVECTOR vId2s ;
bOk = bOk && chainC.GetChainFromNear( ptNear, bHaltOnFork, vId2s) ;
for ( size_t i = 0 ; i < vId2s.size() ; ++i) {
EXE_GeomDB.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ ExeInitContext( void)
int nGseCtx = CreateGseContext() ;
if ( nGseCtx == 0) {
ResetCurrGseContext() ;
LOG_ERROR( GetLogger(), "Error in CreateGseContext (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in CreateGseContext (ExeInitContext)")
return 0 ;
}
GseContext* pGseCtx = GetGseContext( nGseCtx) ;
EXE_MachMgr.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "stdafx.h"
#include "EXE.h"
#include "EXE_Macro.h"
#include "Lua_Base.h"
#include "LUA_Base.h"
#include "AuxTools.h"
#include "DllMachKernel.h"
#include "/EgtDev/Include/EXeExecutor.h"
EXE_Macro.h
+16 -2
View File
@@ -15,16 +15,30 @@
//-----------------------------------------------------------------------------
#define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \
#ifdef __clang__
#define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \
LOG_ERROR( GetLogger(), ( std::string( Msg) + " (" + __func__ + ")").c_str()) \
return Ret ; \
}
#else
#define VERIFY_NULL( pO, Msg, Ret) if ( pO == nullptr) { \
LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \
return Ret ; \
}
#endif
//-----------------------------------------------------------------------------
#define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \
#ifdef __clang__
#define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \
LOG_ERROR( GetLogger(), ( std::string( Msg) + " (" + __func__ + ")").c_str()) \
return Ret ; \
}
#else
#define VERIFY_2NULL( pO, pQ, Msg, Ret) if ( pO == nullptr || pQ == nullptr) { \
LOG_ERROR( GetLogger(), Msg " (" __FUNCTION__ ")") \
return Ret ; \
}
#endif
//-----------------------------------------------------------------------------
#define VERIFY_CTX( pC, Ret) VERIFY_NULL( pC, "Context invalid", Ret)
EXE_ShortestPath.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "stdafx.h"
#include "EXE.h"
#include "EXE_Macro.h"
#include "Lua_Base.h"
#include "LUA_Base.h"
#include "AuxTools.h"
#include "/EgtDev/Include/EXeExecutor.h"
#include "/EgtDev/Include/ENkShortestPath.h"
EgtExecutor.rc
BIN
View File
Binary file not shown.
EgtExecutor.vcxproj
+4 -2
View File
@@ -35,7 +35,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -49,7 +49,7 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -129,6 +129,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
<OmitFramePointers>false</OmitFramePointers>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -196,6 +197,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
LUA_Base.cpp
+37 -37
View File
@@ -27,151 +27,151 @@ bool
LuaInstallEgtFunctions( LuaMgr& LuaMgr)
{
if ( ! LuaInstallGeneral( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeneral (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeneral (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallUiUnits( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallUiUnits (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallUiUnits (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeoBase( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoBase (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoBase (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeomDB( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeomDB (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeomDB (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbCreate( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreate (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreate (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbCreateCurve( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateCurve (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateCurve (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbCreateSurf( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateSurf (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateSurf (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbCreateVol( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateVol (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbCreateVol (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbModify( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModify (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModify (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbModifyCurve( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyCurve (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyCurve (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbModifySurf( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifySurf (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifySurf (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbModifyVol( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyVol (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbModifyVol (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbGet( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGet (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGet (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbGetCurve( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetCurve (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetCurve (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbGetSurf( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetSurf (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetSurf (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbGetVol( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetVol (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetVol (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbPartLayer( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbPartLayer (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbPartLayer (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbObjects( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjects (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjects (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbObjSelection( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjSelection (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjSelection (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGdbObjAttribs( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjAttribs (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGdbObjAttribs (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeoSnap( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoSnap (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoSnap (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeoTransform( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoTransform (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoTransform (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeoDist( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoDist (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoDist (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallGeoInters( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoInters (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallGeoInters (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallCDeObjSolid( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallCDeObjSolid (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallCDeObjSolid (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallMachMgr( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallMachMgr (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallMachMgr (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallMaxFiller( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallMaxFiller (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallMaxFiller (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallNesting( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallNesting (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallNesting (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallScene( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallScene (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallScene (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallPhoto( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallPhoto (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallPhoto (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallPicture( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallPicture (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallPicture (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallImage( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallImage (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallImage (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallExchange( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallExchange (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallExchange (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallBeamMgr( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallBeamMgr (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallBeamMgr (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallPolynomialRoots( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallPolynomialRoots (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallPolynomialRoots (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallShortestPath( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallShortestPath (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallShortestPath (LuaInstallEgtFunctions)")
return false ;
}
if ( ! LuaInstallCAvTool( LuaMgr)) {
LOG_ERROR( GetLogger(), "Error in LuaInstallCAvTool (" __FUNCTION__ ")")
LOG_ERROR( GetLogger(), "Error in LuaInstallCAvTool (LuaInstallEgtFunctions)")
return false ;
}
return true ;
LUA_GdbCreateSurf.cpp
-1
View File
@@ -160,7 +160,6 @@ LuaCreateSurfFrFatCurve( lua_State* L)
LuaCheckParam( L, 4, bSquared)
LuaClearStack( L) ;
// creo una regione piana
int nCount = 0 ;
int nId = ExeCreateSurfFrFatCurve( nParentId, nCrvId, dRad, bSquared) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)
PhotoObj.h
+1 -1
View File
@@ -29,6 +29,7 @@ class PhotoObj : public IUserObj
bool SetOwner( int nId, IGeomDB* pGDB) override ;
int GetOwner( void) const override ;
IGeomDB* GetGeomDB( void) const override ;
bool GetDimensions( double& dDimX, double& dDimY) const override ;
public :
PhotoObj( void) ;
@@ -41,7 +42,6 @@ class PhotoObj : public IUserObj
bool ChangeOrigin( const Point3d& ptOri) ;
bool GetCenter( Point3d& ptCen) const ;
bool ChangeCenter( const Point3d& ptCen) ;
bool GetDimensions( double& dDimX, double& dDimY) const ;
private :
int m_nOwnerId ;
resource.h
BIN
View File
Binary file not shown.