From 1ad5a74a8bfc1d51dca2182d100b504463e63b8f Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Fri, 28 Nov 2025 13:15:16 +0100 Subject: [PATCH] - in MachiningLib CheckCollisionAxisAB sostituito con CheckCollisionWithAxis --- LuaLibs/MachiningLib.lua | 6 ++++-- LuaLibs/PreCollisionLib.lua | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua index 43fe21c..4cf0178 100644 --- a/LuaLibs/MachiningLib.lua +++ b/LuaLibs/MachiningLib.lua @@ -301,7 +301,8 @@ function MachiningLib.GetBladeEngagement( Face, Edge, Part, Tool, dDepthToMachin local bCollisionFoundZ, bMoveAfterSplitZ = PreCollisionLib.CheckCollisionWithAxis( 'Z', Edge, Face.vtN, Face.vtN, Part, Tool, dDepthToMachine) TIMER:stopElapsed( 'CollisionZ') - local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionAxisAB( Edge, Face.vtN, Face.vtN, Part, Tool, dDepthToMachine) + --local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionAxisAB( Edge, Face.vtN, Face.vtN, Part, Tool, dDepthToMachine) + local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionWithAxis( 'AB', Edge, Face.vtN, Face.vtN, Part, Tool, dDepthToMachine) if bCollisionCheckForDownUpOnly or not bCollisionFound then return true, sBladeEngagement, bMoveAfterSplit @@ -327,7 +328,8 @@ function MachiningLib.GetBladeEngagement( Face, Edge, Part, Tool, dDepthToMachin end -- orientamento faccia / utensile compatibili con DownUp: lavorabile - local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionAxisAB( Edge, Face.vtN, -Face.vtN, Part, Tool, dDepthToMachine) + --local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionAxisAB( Edge, Face.vtN, -Face.vtN, Part, Tool, dDepthToMachine) + local bCollisionFound, bMoveAfterSplit = PreCollisionLib.CheckCollisionWithAxis( 'AB', Edge, Face.vtN, -Face.vtN, Part, Tool, dDepthToMachine) if not bCollisionFound then sBladeEngagement = 'DownUp' diff --git a/LuaLibs/PreCollisionLib.lua b/LuaLibs/PreCollisionLib.lua index 5cfb7a6..65a078b 100644 --- a/LuaLibs/PreCollisionLib.lua +++ b/LuaLibs/PreCollisionLib.lua @@ -171,7 +171,7 @@ function PreCollisionLib.CheckCollisionWithAxis( sAxis, Edge, vtNFace, vtHead, P bCollisionFoundPiece = not EgtSurfFrTestExternal( idPartSurfFr, idCollisionSurfFr) if EgtGetDebugLevel() >= 3 and bCollisionFoundPiece then - EgtSetColor( { idCollisionSurfFr, idCollisionSurfFr}, RED()) + EgtSetColor( idCollisionSurfFr, RED()) end end @@ -183,7 +183,7 @@ function PreCollisionLib.CheckCollisionWithAxis( sAxis, Edge, vtNFace, vtHead, P bCollisionFoundRestLength = not EgtSurfFrTestExternal( idRestLengthSurfFr, idCollisionSurfFr) if EgtGetDebugLevel() >= 3 and bCollisionFoundRestLength then - EgtSetColor( { idRestLengthSurfFr, idCollisionSurfFr}, ORANGE()) + EgtSetColor( idCollisionSurfFr, ORANGE()) end end