Merge branch 'develop'

LuaLibs/BeamExec.lua

@@ -2653,43 +2653,17 @@ function BeamExec.ProcessAlternatives( PARTS)
    end
 
    -- passaggio info a interfaccia da scrivere sul pezzo
-   local function IsStateInAlternativesNest2D( sState)
-      for _, v in ipairs( AlternativesNest2D) do
-         if v == sState then
-            return true
-         end
-      end
-      return false
-   end
    BEAM.INFONGEPART = {}
-   local States = {
-      "1000",
-      "0100",
-      "0010",
-      "0001",
-      "1000_INV",
-      "0100_INV",
-      "0010_INV",
-      "0001_INV",
-   }
-   for i = 1, #States do
-      local sState = States[i]
-      if IsStateInAlternativesNest2D( sState) then
-         if PARTS[nPart].HeadcutInfo then
-            local HeadcutInfo = PARTS[nPart].HeadcutInfo[sState]
-            local sOffsetX = table.concat( HeadcutInfo.OffsetX, ',')
-            local sVtN = ( tostring( HeadcutInfo.vtN)):gsub("^%(", ""):gsub("%)$", "")
-            table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_H' .. '=' .. sOffsetX .. ';' .. sVtN )
-         end
-         if PARTS[nPart].TailcutInfo then
-            local TailCutInfo = PARTS[nPart].TailcutInfo[sState]
-            local sOffsetX = table.concat( TailCutInfo.OffsetX, ',')
-            local sVtN = ( tostring( TailCutInfo.vtN)):gsub("^%(", ""):gsub("%)$", "")
-            table.insert( BEAM.INFONGEPART, 'ALT' .. sState .. '_T' .. '=' .. sOffsetX .. ';' .. sVtN)
-         end
-      else
-         table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_H' .. '= ')
-         table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_T' .. '= ')
+   for i = 1, #AlternativesNest2D do
+      if PARTS[nPart].HeadcutInfo then
+         local sOffsetX = table.concat( PARTS[nPart].HeadcutInfo[AlternativesNest2D[i]].OffsetX, ',')
+         local sVtN = ( tostring( PARTS[nPart].HeadcutInfo[AlternativesNest2D[i]].vtN)):gsub("^%(", ""):gsub("%)$", "")
+         table.insert( BEAM.INFONGEPART, 'ALT' .. AlternativesNest2D[i].. '_H' .. '=' .. sOffsetX .. ';' .. sVtN )
+      end
+      if PARTS[nPart].TailcutInfo then
+         local sOffsetX = table.concat( PARTS[nPart].TailcutInfo[AlternativesNest2D[i]].OffsetX, ',')
+         local sVtN = ( tostring( PARTS[nPart].TailcutInfo[AlternativesNest2D[i]].vtN)):gsub("^%(", ""):gsub("%)$", "")
+         table.insert( BEAM.INFONGEPART, 'ALT' .. AlternativesNest2D[i] .. '_T' .. '=' .. sOffsetX .. ';' .. sVtN)
       end
    end
 

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di BeamNT
 
 NAME = 'BeamNT'
-VERSION = '3.1g1'
+VERSION = '3.1g2'
 MIN_EXE = '3.1g1'