Merge branch 'NewTopColl'

Essetre-FASTrl.mlde

@@ -10,9 +10,9 @@
 require( 'EmtGenerator')
 EgtEnableDebug( true)
 
-PP_VER = '2.7k1'
-PP_NVER = '2.7.11.1'
-MIN_MACH_VER = '2.5k1'
+PP_VER = '2.7k2'
+PP_NVER = '2.7.11.2'
+MIN_MACH_VER = '2.7j1'
 MACH_NAME = string.match( EgtGetCurrMachineDir(), "[^\\]+$")  -- si ricava il nome della macchina dal direttorio
 
 -- Carico i dati globali
@@ -203,7 +203,7 @@ local CId = EmtAxis {
       Stroke = {MinC, MaxC},
       Home = 0,
       Geo = 'C_AXIS/GEO',
-      Aux = {'C_AXIS/SOLID', 'C_AXIS/COLLISION'}}
+      Aux = {'C_AXIS/SOLID', 'C_AXIS/COLLISION', 'C_AXIS/COLLISION2'}}
 if NewTopC then
    local vtMove = Vector3d( 65,0,0)
    local SolidArmId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'SOLID'), 'ARM')
@@ -218,9 +218,13 @@ if NewTopC then
    local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
    EgtMove( CollTopId, vtMove, GDB_RT.GLOB)
    EgtSetName( CollTopId, 'BOX')
+   local RefId = CollTopId + EgtGetInfo( CollTopId, 'Frame', 'i')
+   EgtSetInfo( RefId, 'CollSkip', 'C_TOP')
 else
    local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
    EgtSetName( CollTopId, 'BOX')
+   local RefId = CollTopId + EgtGetInfo( CollTopId, 'Frame', 'i')
+   EgtSetInfo( RefId, 'CollSkip', 'C_TOP')
 end
 EmtAxis {
       Name = 'B',