EgtInterface 1.6d3 :

- costanti stringa sostituite con costanti numeriche
- modificate funzioni API e LUA per scansione pezzi e layer
- aggiunta pulizia memoria al caricamento messaggi (necessario al cambio lingua)
- migliorie varie a funzioni Lua.
This commit is contained in:
Dario Sassi
2015-04-20 08:43:10 +00:00
parent fd718143e6
commit 9d3dc5e537
38 changed files with 810 additions and 824 deletions
+62 -26
View File
@@ -16,9 +16,9 @@
#include "API.h"
#include "LUA.h"
#include "LUA_Base.h"
#include "LUA_Aux.h"
#include "/EgtDev/Include/EInAPI.h"
#include "/EgtDev/Include/EgnStringUtils.h"
#include "/EgtDev/Include/EGkLuaAux.h"
#include "/EgtDev/Include/EGnStringUtils.h"
using namespace std ;
@@ -80,59 +80,94 @@ LuaResetCurrPartLayer( lua_State* L)
//-------------------------------------------------------------------------------
static int
LuaGetFirstVisiblePart( lua_State* L)
LuaGetPartNbr( lua_State* L)
{
// nessun parametro
// nessuno o 1 parametro : [bOnlyVisible]
bool bOnlyVisible = false ;
LuaGetParam( L, 1, bOnlyVisible) ;
LuaClearStack( L) ;
// cerco primo pezzo e layer validi per essere dichiarati correnti
int nId = EgtGetFirstVisiblePart() ;
// recupero numero pezzi
int nNbr = EgtGetPartNbr( bOnlyVisible) ;
// restituisco il risultato
LuaSetReturn( L, nId) ;
LuaSetReturn( L, nNbr) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetNextVisiblePart( lua_State* L)
LuaGetFirstPart( lua_State* L)
{
// 1 parametro : nPartId
// nessuno o 1 parametro : [bOnlyVisible]
bool bOnlyVisible = false ;
LuaGetParam( L, 1, bOnlyVisible) ;
LuaClearStack( L) ;
// cerco primo pezzo
int nId = EgtGetFirstPart( bOnlyVisible) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)
LuaSetReturn( L, nId) ;
else
LuaSetReturn( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetNextPart( lua_State* L)
{
// 1 o 2 parametri : nPartId [, bOnlyVisible]
int nPartId ;
LuaCheckParam( L, 1, nPartId)
bool bOnlyVisible = false ;
LuaGetParam( L, 2, bOnlyVisible) ;
LuaClearStack( L) ;
// cerco primo pezzo e layer validi per essere dichiarati correnti
int nId = EgtGetNextVisiblePart( nPartId) ;
// cerco pezzo successivo
int nId = EgtGetNextPart( nPartId, bOnlyVisible) ;
// restituisco il risultato
LuaSetReturn( L, nId) ;
if ( nId != GDB_ID_NULL)
LuaSetReturn( L, nId) ;
else
LuaSetReturn( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetFirstVisibleLayer( lua_State* L)
LuaGetFirstLayer( lua_State* L)
{
// 1 parametro : nPartId
// 1 o 2 parametri : nPartId [, bOnlyVisible]
int nPartId ;
LuaCheckParam( L, 1, nPartId)
bool bOnlyVisible = false ;
LuaGetParam( L, 2, bOnlyVisible) ;
LuaClearStack( L) ;
// cerco il primo layer visibile del pezzo
int nId = EgtGetFirstVisibleLayer( nPartId) ;
// cerco il primo layer del pezzo
int nId = EgtGetFirstLayer( nPartId, bOnlyVisible) ;
// restituisco il risultato
LuaSetReturn( L, nId) ;
if ( nId != GDB_ID_NULL)
LuaSetReturn( L, nId) ;
else
LuaSetReturn( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetNextVisibleLayer( lua_State* L)
LuaGetNextLayer( lua_State* L)
{
// 1 parametro : nLayerId
// 1 o 2 parametri : nLayerId [, bOnlyVisible]
int nLayerId ;
LuaCheckParam( L, 1, nLayerId)
bool bOnlyVisible = false ;
LuaGetParam( L, 2, bOnlyVisible) ;
LuaClearStack( L) ;
// cerco il prossimo layer visibile (ovviamente dello stesso pezzo)
int nId = EgtGetNextVisibleLayer( nLayerId) ;
// cerco il prossimo layer (ovviamente dello stesso pezzo)
int nId = EgtGetNextLayer( nLayerId, bOnlyVisible) ;
// restituisco il risultato
LuaSetReturn( L, nId) ;
if ( nId != GDB_ID_NULL)
LuaSetReturn( L, nId) ;
else
LuaSetReturn( L) ;
return 1 ;
}
@@ -222,10 +257,11 @@ LuaInstallGdbPartLayer( void)
bOk = bOk && LuaRegisterFunction( "EgtGetCurrLayer", LuaGetCurrLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtSetCurrPartLayer", LuaSetCurrPartLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtResetCurrPartLayer", LuaResetCurrPartLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtGetFirstVisiblePart", LuaGetFirstVisiblePart) ;
bOk = bOk && LuaRegisterFunction( "EgtGetNextVisiblePart", LuaGetNextVisiblePart) ;
bOk = bOk && LuaRegisterFunction( "EgtGetFirstVisibleLayer", LuaGetFirstVisibleLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtGetNextVisibleLayer", LuaGetNextVisibleLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtGetPartNbr", LuaGetPartNbr) ;
bOk = bOk && LuaRegisterFunction( "EgtGetFirstPart", LuaGetFirstPart) ;
bOk = bOk && LuaRegisterFunction( "EgtGetNextPart", LuaGetNextPart) ;
bOk = bOk && LuaRegisterFunction( "EgtGetFirstLayer", LuaGetFirstLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtGetNextLayer", LuaGetNextLayer) ;
bOk = bOk && LuaRegisterFunction( "EgtSelectPartObjs", LuaSelectPartObjs) ;
bOk = bOk && LuaRegisterFunction( "EgtDeselectPartObjs", LuaDeselectPartObjs) ;
bOk = bOk && LuaRegisterFunction( "EgtSelectLayerObjs", LuaSelectLayerObjs) ;