From f51096ea8ff8714fe29049c92575abb06e4cefa5 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 11 Apr 2019 11:12:38 +0000 Subject: [PATCH] EgtMachKernel 2.1d2 : - aggiunta gestione direzione movimento nella parte mobile delle attrezzature (morse, ventose...) tramite info MDIR. --- Disposition.cpp | 12 +++++++++--- EgtMachKernel.rc | Bin 11774 -> 11774 bytes 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Disposition.cpp b/Disposition.cpp index b65f554..5215dec 100644 --- a/Disposition.cpp +++ b/Disposition.cpp @@ -597,7 +597,9 @@ Disposition::AddFixture( const string& sName, const Point3d& ptPos, double dAngD double dCurrVal = 0 ; m_pGeomDB->GetInfo( nMobId, FXT_MOB_CPOS, dCurrVal) ; if ( abs( dMov - dCurrVal) > EPS_SMALL) { - m_pGeomDB->TranslateGroup( nMobId, Vector3d( 0, 0, dMov - dCurrVal)) ; + Vector3d vtDir = Z_AX ; + m_pGeomDB->GetInfo( nMobId, FXT_MOB_MOVEDIR, vtDir) ; + m_pGeomDB->TranslateGroup( nMobId, (dMov - dCurrVal) * vtDir) ; m_pGeomDB->SetInfo( nMobId, FXT_MOB_CPOS, dMov) ; } } @@ -723,7 +725,9 @@ Disposition::MoveFixtureMobile( int nId, double dDeltaMov) double dCurrVal = 0 ; m_pGeomDB->GetInfo( nMobId, FXT_MOB_CPOS, dCurrVal) ; if ( abs( dDeltaMov) > EPS_SMALL) { - m_pGeomDB->TranslateGroup( nMobId, Vector3d( 0, 0, dDeltaMov)) ; + Vector3d vtDir = Z_AX ; + m_pGeomDB->GetInfo( nMobId, FXT_MOB_MOVEDIR, vtDir) ; + m_pGeomDB->TranslateGroup( nMobId, dDeltaMov * vtDir) ; m_pGeomDB->SetInfo( nMobId, FXT_MOB_CPOS, ( dCurrVal + dDeltaMov)) ; } } @@ -783,7 +787,9 @@ Disposition::PlaceFixture( int nId, const Point3d& ptPos, double dAngDeg, double double dCurrVal = 0 ; m_pGeomDB->GetInfo( nMobId, FXT_MOB_CPOS, dCurrVal) ; if ( abs( dMov - dCurrVal) > EPS_SMALL) { - m_pGeomDB->TranslateGroup( nMobId, Vector3d( 0, 0, dMov - dCurrVal)) ; + Vector3d vtDir = Z_AX ; + m_pGeomDB->GetInfo( nMobId, FXT_MOB_MOVEDIR, vtDir) ; + m_pGeomDB->TranslateGroup( nMobId, ( dMov - dCurrVal) * vtDir) ; m_pGeomDB->SetInfo( nMobId, FXT_MOB_CPOS, dMov) ; } } diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index ea7ea154158a33fe711e95dcc35747a736f176c1..1773b2d5223d8b9f60dec7340f14c1a0938e2db2 100644 GIT binary patch delta 97 zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmU8!BZvS1 delta 97 zcmewt{V#gMFE&QQ&A-`fnHdcyKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmU3rBY*$^