From c5573e438bcfc2d1ccabd7679077c03fbd7eaa9b Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Mon, 21 Apr 2025 10:01:41 +0200
Subject: [PATCH] EgtGeomKernel 2.7d2 : - in VolZmap migliorato calcolo step
 per Vmill 4assi.

---
 EgtGeomKernel.rc  | Bin 11710 -> 11710 bytes
 VolZmapVolume.cpp |  30 ++++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index fa9b849f9903c85801cec8de3e1527c60508c05e..1df8e39354c2186cef1ecc012c83ae4b6df597c2 100644
GIT binary patch
delta 236
zcmdlNy)SyhI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0PijeT
z{=m$}%xJXvyqqG4`lwjSxVewp10r;uY4S3`JfN_k6i~QJ7*lvJ3$os9QmsEYnTvVZ
l<X37uydZ~qf}NJbPziF_<PXeQn|suCm{FxRpVa!w1OODuK@0!@

delta 238
zcmdlNy)SyhI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731Uy?R&U)L$1;bB
z(Qxx`HbrJe!^w)=x|_YYCa?fSZu8k9MBErR_Xv9d`53|-(qLf}{T_^)vy{Iv66=o5
l-Kxcmg85*FdV(FA19V{GW^VP3%$UNHyHyWv?$S140s!KrI!gcm

diff --git a/VolZmapVolume.cpp b/VolZmapVolume.cpp
index 51867ce..fd78d24 100644
--- a/VolZmapVolume.cpp
+++ b/VolZmapVolume.cpp
@@ -874,6 +874,7 @@ VolZmap::MillingStep( int nCurrTool,
    bool bOk ;
    if ( AreSameVectorApprox( vtDLs, vtDLe))
       bOk = MillingTranslationStep( ptPLs, ptPLe, vtDLs, vtALs) ;
+  // altrimenti anche rotazione
    else
       bOk = MillingGeneralMotionStep( ptPLs, vtDLs, vtALs, ptPLe, vtDLe, vtALe) ;
 
@@ -886,15 +887,36 @@ VolZmap::MillingStep( int nCurrTool,
    return bOk ;
 }
 
+//----------------------------------------------------------------------------
+static bool
+GetAlongAcrossRotation( const Vector3d& vtDir1, const Vector3d& vtDir2, const Vector3d& vtRef,
+                        double& dAlongAngDeg, double& dAcrossAngDeg)
+{
+   Vector3d vtAxis = vtRef ;
+   if ( vtAxis.Normalize()) {
+      bool bDet ; vtDir1.GetRotation( vtDir2, vtAxis, dAcrossAngDeg, bDet) ;
+      Vector3d vtDirM = GetRotate( vtDir1, vtAxis, dAcrossAngDeg) ;
+      vtDirM.GetAngle( vtDir2, dAlongAngDeg) ;
+   }
+   else {
+      vtDir1.GetAngle( vtDir2, dAlongAngDeg) ;
+      dAcrossAngDeg = 0 ;
+   }
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 VolZmap::MillingGeneralMotionStep( const Point3d& ptPs, const Vector3d& vtDs, const Vector3d& vtAs,
                                    const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe)
 {
+  // Calcolo angoli di rotazione utensile longitudinale e trasversale rispetto al movimento
+   double dAlongAngDeg, dAcrossAngDeg ;
+   GetAlongAcrossRotation( vtDs, vtDe, ptPe - ptPs, dAlongAngDeg, dAcrossAngDeg) ;
   // Divido il movimento in tratti con direzione utensile costante
-   const double ANG_STEP = 0.04 ;
-   double dAngDeg ; vtDs.GetAngle( vtDe, dAngDeg) ;
-   int nStepCnt = int( abs( dAngDeg) / ANG_STEP) + 1 ;
+   const double ANG_ACROSS_STEP = 0.04 ;
+   const double ANG_ALONG_STEP = 1.0 ;
+   int nStepCnt = int( max( { abs( dAlongAngDeg) / ANG_ALONG_STEP, abs( dAcrossAngDeg) / ANG_ACROSS_STEP, 1.})) ;
    bool bOk = true ;
    Point3d ptSt = ptPs ;
    for ( int i = 0 ; i <= nStepCnt && bOk ; ++ i) {
@@ -1168,7 +1190,7 @@ VolZmap::SelectMotion( int nGrid, const Point3d& ptLs, const Point3d& ptLe, cons
 }
 
 
-// ---------- VERSORE UTENSILE DERETTO COME Z --------------------------------
+// ---------- VERSORE UTENSILE DIRETTO COME Z --------------------------------
 
 
 // ---------- Cilindro e sfera -----------------------------------------------