From a55fe51fde4c465e0ccf33ce0cdb73e6022da5a3 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 4 Dec 2024 15:06:25 +0100 Subject: [PATCH] EgtExecutor 2.6l2 : - aggiunta funzione Exe e Lua GetClEntAxesStatus. --- EXE_MachMgr.cpp | 12 +++++++++++- EgtExecutor.rc | Bin 18898 -> 18898 bytes LUA_MachMgr.cpp | 22 +++++++++++++++++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 12805a4..584fdf6 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -3039,13 +3039,23 @@ ExeGetClEntIndex( int nEntId, int& nIndex) return pMachMgr->GetClEntIndex( nEntId, nIndex) ; } +//----------------------------------------------------------------------------- +bool +ExeGetClEntAxesStatus( int nEntId, int& nStatus) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero lo stato del movimento assi + return pMachMgr->GetClEntAxesStatus( nEntId, nStatus) ; +} + //----------------------------------------------------------------------------- bool ExeGetClEntAxesMask( int nEntId, int& nMask) { IMachMgr* pMachMgr = GetCurrMachMgr() ; VERIFY_MACHMGR( pMachMgr, false) - // recupero la mascheratura del movimento assi + // recupero la mascheratura del movimento assi (valida solo in rapido) return pMachMgr->GetClEntAxesMask( nEntId, nMask) ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index fab46e9b68b1bb673393ca83c0c7b4a6f11f82ea..fad8802d8aac418f6e8d0b68482198d87cd77be0 100644 GIT binary patch delta 99 zcmcaKneozO#tnbi7>zbx6uZte`3h$qqtWC*Zr#lVTs15}(SvfAnI<0)gozp`xiM~D fB&^2_*5C@Hpo;w%H&2oV3m=qogb5ocEm8*n;L{*B delta 99 zcmcaKneozO#tnbi7!5aH6uZte`3h$qqv7O0Zr#lVTs15}(SvfAnI<0)gozp`xiM~D fB&^2_*5C@Hpo;w%H&2oV3m=qogb5ocEm8*n-%TJc diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 0a8d976..b41e835 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -3155,6 +3155,25 @@ LuaGetClEntIndex( lua_State* L) return 1 ; } +//----------------------------------------------------------------------------- +static int +LuaGetClEntAxesStatus( lua_State* L) +{ + // 1 parametro : nEntId + int nEntId ; + LuaGetParam( L, 1, nEntId) ; + LuaClearStack( L) ; + // recupero lo stato del movimento assi + int nStatus ; + bool bOk = ExeGetClEntAxesStatus( nEntId, nStatus) ; + // restituisco il risultato + if ( bOk) + LuaSetParam( L, nStatus) ; + else + LuaSetParam( L) ; + return 1 ; +} + //----------------------------------------------------------------------------- static int LuaGetClEntAxesMask( lua_State* L) @@ -3163,7 +3182,7 @@ LuaGetClEntAxesMask( lua_State* L) int nEntId ; LuaGetParam( L, 1, nEntId) ; LuaClearStack( L) ; - // recupero la mascheratura del movimento assi + // recupero la mascheratura del movimento assi (valida solo in rapido) int nMask ; bool bOk = ExeGetClEntAxesMask( nEntId, nMask) ; // restituisco il risultato @@ -4446,6 +4465,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntMove", LuaGetClEntMove) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntFlag", LuaGetClEntFlag) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntIndex", LuaGetClEntIndex) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntAxesStatus", LuaGetClEntAxesStatus) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntAxesMask", LuaGetClEntAxesMask) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntAxesVal", LuaGetClEntAxesVal) ; // Simulation