diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua index 0aad1d4..4eb0bf0 100644 --- a/LuaLibs/WallExec.lua +++ b/LuaLibs/WallExec.lua @@ -71,40 +71,40 @@ local function GetRawOrigAndDeltas() sOrigCorner = WD.GetOrigCorner( EgtGetInfo( BtlInfoId, 'REFPOS', 'i') or 0) end -- offset da interfaccia - local dDeltaXFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAY', 'd') or 0 - local dDeltaYFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAX', 'd') or 0 - local dDeltaZFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAZ', 'd') or 0 + local dDeltaXFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAY', 'd') + local dDeltaYFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAX', 'd') + local dDeltaZFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAZ', 'd') -- se da interfaccia arriva un valore > 0 si usa quello, altrimenti si legge da WallData (default 0) - local DeltaX = EgtIf( dDeltaXFromBtl > 0, dDeltaXFromBtl, WD.DELTA_X or 0) - local DeltaY = EgtIf( dDeltaYFromBtl > 0, dDeltaYFromBtl, WD.DELTA_Y or 0) - local DeltaZ = EgtIf( dDeltaZFromBtl > 0, dDeltaZFromBtl, WD.DELTA_Z or 0) + local DeltaX = EgtIf( dDeltaXFromBtl, dDeltaXFromBtl, WD.DELTA_X or 0) + local DeltaY = EgtIf( dDeltaYFromBtl, dDeltaYFromBtl, WD.DELTA_Y or 0) + local DeltaZ = EgtIf( dDeltaZFromBtl, dDeltaZFromBtl, WD.DELTA_Z or 0) local nCorner local OrigOnTab if sOrigCorner == 'TL' then nCorner = MCH_CR.TL - OrigOnTab = Point3d( 0 + abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( 0 + DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BL' then nCorner = MCH_CR.BL - OrigOnTab = Point3d( 0 + abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( 0 + DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TR' then nCorner = MCH_CR.TR - OrigOnTab = Point3d( b3Tab:getDimX() - abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( b3Tab:getDimX() - DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BR' then nCorner = MCH_CR.BR - OrigOnTab = Point3d( b3Tab:getDimX() - abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( b3Tab:getDimX() - DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TM' then nCorner = MCH_CR.TR - OrigOnTab = Point3d( WD.MID_REF - abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.MID_REF - DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BM' then nCorner = MCH_CR.BR - OrigOnTab = Point3d( WD.MID_REF - abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.MID_REF - DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TN' then nCorner = MCH_CR.TL - OrigOnTab = Point3d( WD.NEW_REF + abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.NEW_REF + DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BN' then nCorner = MCH_CR.BL - OrigOnTab = Point3d( WD.NEW_REF + abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.NEW_REF + DeltaX, DeltaY, DeltaZ) end return sOrigCorner, nCorner, OrigOnTab