diff --git a/Common_FAST.mlpe b/Common_FAST.mlpe index dc91268..1ab56e9 100644 --- a/Common_FAST.mlpe +++ b/Common_FAST.mlpe @@ -115,7 +115,8 @@ function OnSimulStart() { Grp = 'V', Sub = 'COLLISION', Name = 'VOL2'}, { Grp = 'PV', Sub = 'COLLISION', Name = 'VOL'}, { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE1'}, - { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'}} + { Grp = 'Base', Sub = 'COLLISION', Name = 'SIDE2'}, + { Grp = 'C', Sub = 'COLLISION2', Name = 'C_TOP'}} EgtOutLog( 'MCODET Objects :', 4) local nMcdNullCnt = 0 for i = 1, #McdData do diff --git a/Essetre-FASTrl.mlde b/Essetre-FASTrl.mlde index b2ce871..8cdbc2f 100644 --- a/Essetre-FASTrl.mlde +++ b/Essetre-FASTrl.mlde @@ -10,9 +10,9 @@ require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.7i4' +PP_VER = '2.7j1_DEV1' PP_NVER = '2.7.9.4' -MIN_MACH_VER = '2.5k1' +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', diff --git a/Essetre-FASTrl.nge b/Essetre-FASTrl.nge index 891d540..0fd9243 100644 Binary files a/Essetre-FASTrl.nge and b/Essetre-FASTrl.nge differ