From 8e986740faa99a36bbad9b3ffa8b3733b54b6dae Mon Sep 17 00:00:00 2001 From: "riccardo.elitropi" Date: Mon, 22 Aug 2022 17:46:43 +0200 Subject: [PATCH 01/11] EgtGraphics : - Aggiunte due funzioni per ExportThreeJS. --- Scene.h | 2 ++ SceneCamera.cpp | 16 +++++++++++++++- SceneGrid.cpp | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Scene.h b/Scene.h index c5e2a04..914f44b 100644 --- a/Scene.h +++ b/Scene.h @@ -106,6 +106,7 @@ class Scene : public IEGrScene bool ZoomChange( double dCoeff) override ; bool ZoomOnPoint( const Point3d& ptWin, double dCoeff) override ; bool ZoomWin( const Point3d& ptWin1, const Point3d& ptWin2) override ; + void GetOrthoCamParam( double* pdWidth, double* pdHeight, double* pdNear, double* pdFar) const override ; // ShowMode bool SetShowMode( int nShowMode) override { if ( nShowMode != SM_WIREFRAME && @@ -142,6 +143,7 @@ class Scene : public IEGrScene bool SetGridShow( bool bShowGrid, bool bShowFrame) override ; bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) override ; bool SetGridColor( Color colMinLine, Color colMajLine) override ; + void GetGridParam( double* pdSnapStep, int* pnExtStep) const override ; // Glob Frame bool SetGlobFrameShow( bool bShow) override ; // Direct diff --git a/SceneCamera.cpp b/SceneCamera.cpp index e962f1b..98310ac 100644 --- a/SceneCamera.cpp +++ b/SceneCamera.cpp @@ -418,4 +418,18 @@ Scene::ZoomWin( const Point3d& ptWin1, const Point3d& ptWin2) // adatto le dimensioni a quelle della vista return AdjustDimView( dHalfWidth, dHalfHeight) ; -} \ No newline at end of file +} + +//---------------------------------------------------------------------------- +void +Scene::GetOrthoCamParam( double* pdWidth, double* pdHeight, double* pdNear, double* pdFar) const +{ + if ( pdWidth != nullptr) + *pdWidth = m_dHalfWidth ; + if ( pdHeight != nullptr) + *pdHeight = m_dHalfHeight ; + if ( pdNear != nullptr) + *pdNear = m_dZNear ; + if ( pdFar != nullptr) + *pdFar = m_dZFar ; +} diff --git a/SceneGrid.cpp b/SceneGrid.cpp index d0990e0..bc3ef49 100644 --- a/SceneGrid.cpp +++ b/SceneGrid.cpp @@ -170,4 +170,14 @@ Scene::DrawGrid( void) glLineWidth( (float) GetLineWidth()) ; return true ; +} + +//---------------------------------------------------------------------------- +void +Scene::GetGridParam(double* pdSnapStep, int* pnExtStep) const +{ + if ( pdSnapStep != nullptr) + *pdSnapStep = m_dSnapStep ; + if ( pnExtStep != nullptr) + *pnExtStep = m_nExtSstep ; } \ No newline at end of file From 9989ea95d7df8c075fd99d487c2fcf7290d929ed Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Wed, 5 Oct 2022 12:11:31 +0200 Subject: [PATCH 02/11] EgtGraphics : - modifica GetgridParam. --- Scene.h | 2 +- SceneGrid.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Scene.h b/Scene.h index 914f44b..4a8c9fa 100644 --- a/Scene.h +++ b/Scene.h @@ -143,7 +143,7 @@ class Scene : public IEGrScene bool SetGridShow( bool bShowGrid, bool bShowFrame) override ; bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) override ; bool SetGridColor( Color colMinLine, Color colMajLine) override ; - void GetGridParam( double* pdSnapStep, int* pnExtStep) const override ; + void GetGridParam( double& dSnapStep, int& nExtStep) const override ; // Glob Frame bool SetGlobFrameShow( bool bShow) override ; // Direct diff --git a/SceneGrid.cpp b/SceneGrid.cpp index 60b5f59..d252e9f 100644 --- a/SceneGrid.cpp +++ b/SceneGrid.cpp @@ -200,10 +200,8 @@ Scene::DrawGrid( void) //---------------------------------------------------------------------------- void -Scene::GetGridParam(double* pdSnapStep, int* pnExtStep) const +Scene::GetGridParam(double& dSnapStep, int& nExtStep) const { - if ( pdSnapStep != nullptr) - *pdSnapStep = m_dSnapStep ; - if ( pnExtStep != nullptr) - *pnExtStep = m_nExtSstep ; + dSnapStep = m_dSnapStep ; + nExtStep = m_nExtSstep ; } \ No newline at end of file From 76d7496e2e1983d8fa1a95f4a029689ad9d7d59d Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Thu, 20 Oct 2022 16:15:29 +0200 Subject: [PATCH 03/11] EgtGraphics 2.4j1 : - aggiunta funzione per esportazione della griglia. --- EgtGraphics.rc | Bin 11606 -> 11614 bytes Scene.h | 1 + SceneGrid.cpp | 9 ++++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 65d1c571c3ab752082e07feb65cea383be6c6470..9805fbac49b3efb8f30e85f6fedf872acf2b8359 100644 GIT binary patch delta 279 zcmcZ>buVheI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731Ux9)RLaOPc3V6 z9Lo$Qc0&dO1|0^&%?J7RGfm>rnOvZ#!kh)Y0Q{Xn-jIZG64Wf CxJL>A delta 293 zcmcZ?buDVcI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0Gqt2Q ze_&=}X0>F{VKCZ!kZ(WJl%o InOa|&0D53b{{R30 diff --git a/Scene.h b/Scene.h index 4a8c9fa..b3a22c7 100644 --- a/Scene.h +++ b/Scene.h @@ -144,6 +144,7 @@ class Scene : public IEGrScene bool SetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtSstep) override ; bool SetGridColor( Color colMinLine, Color colMajLine) override ; void GetGridParam( double& dSnapStep, int& nExtStep) const override ; + bool GetShowGrid() override ; // Glob Frame bool SetGlobFrameShow( bool bShow) override ; // Direct diff --git a/SceneGrid.cpp b/SceneGrid.cpp index d252e9f..afa901f 100644 --- a/SceneGrid.cpp +++ b/SceneGrid.cpp @@ -200,8 +200,15 @@ Scene::DrawGrid( void) //---------------------------------------------------------------------------- void -Scene::GetGridParam(double& dSnapStep, int& nExtStep) const +Scene::GetGridParam( double& dSnapStep, int& nExtStep) const { dSnapStep = m_dSnapStep ; nExtStep = m_nExtSstep ; +} + +//---------------------------------------------------------------------------- +bool +Scene::GetShowGrid() +{ + return m_bShowGrid ; } \ No newline at end of file From f37aeb5892146439c8b2bb99243e64d0a0d9cd1e Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 2 Nov 2022 15:14:00 +0100 Subject: [PATCH 04/11] EgtGraphics 2.4k1 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11614 -> 11614 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 9805fbac49b3efb8f30e85f6fedf872acf2b8359..22817da7aaec66835e0d7f5a33ba92658d8195a5 100644 GIT binary patch delta 257 zcmcZ?buVheI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0Gqt2Q ze_&=|W;EQqQ0y?%tGa|^cxL|UI2EL6+5IZN0KMQAe% z9{nQ9FBnO5)4|DH%*!TssqyfFT<-~XZw^Bx$hDI{FlTMnQP*KcmD-%C^_2+#i=sx~ delta 230 zcmcZ?buVheI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731UxPt=76Zj%5}T zqrv8be21AP@8Jw!%-Z}>u$pmm2e$ Date: Tue, 3 Jan 2023 08:54:53 +0100 Subject: [PATCH 05/11] EgtGraphics 2.5a1 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11614 -> 11606 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 22817da7aaec66835e0d7f5a33ba92658d8195a5..079e4ee23576d6af49ab01867e7e024dcb1848ed 100644 GIT binary patch delta 201 zcmcZ?buDVcCpKnN2A#?K`Scl0H^1kb$~1Woryo!#aq>sOmyE`f_e)Kj+`)a0(R4B+ zkND<19v>zY_5VR!gxblI^Mud9)jBawu8_@|{7-ZNPCc9VOT{z7HCQojE|3*sL{W{^ OMH0#|7yVOC-~<4BMML2L delta 210 zcmcZ>buVheCpK0S1|0^&$@Oyjj3%4c%ROddHetw~d|vV;qtWDgrOA^!xX&<}Ouon= zzS%&=igEKYULi&_EmN5$Hwb2-Xqz}WL--uBwhmF^w0TJ*wD~ZhS%mDi&Gkz0j1U_p N8_2xc{6M9Q0{|P~L&X39 From 8b47da0588ef8d5cb63656c7e943e0015d9576e2 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 9 Feb 2023 10:18:32 +0100 Subject: [PATCH 06/11] EgtGraphics 2.5b1 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11606 -> 11606 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 079e4ee23576d6af49ab01867e7e024dcb1848ed..a56dca2a63219c5e0a784fd44baeb71f095ae1cd 100644 GIT binary patch delta 86 zcmcZ>buDVcH#SD2&5d%x%#2B!&r4P_Zf@f?V+IQyW}4g}m;)BBW!#)4Y=R-Ykp)e! IfU+AG07TLqGynhq delta 86 zcmcZ>buDVcH#SDY&5d%x%#4Yf&r4P_Zf@f?V+IQyW}4g}m;)BBW!#)4Y=R-Ykp)e! IfU+AG07G~kEC2ui From 7fd9bae8fc4a9fedcbbfe82a449c046ce92a97ab Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 20 Feb 2023 09:15:51 +0100 Subject: [PATCH 07/11] EgtGraphics 2.5b2 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11606 -> 11606 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index a56dca2a63219c5e0a784fd44baeb71f095ae1cd..6d458855525f4c304e2dfed3f2a486a2f4f940ac 100644 GIT binary patch delta 92 zcmcZ>buDVcFE&P_%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT>(Cx} delta 92 zcmcZ>buDVcFE&QQ%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT>Rujj From 1a393126f39732775f138e21a022847a7e5f9b98 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 27 Feb 2023 08:16:29 +0100 Subject: [PATCH 08/11] EgtGraphics 2.5b3 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11606 -> 11606 bytes EgtGraphics.vcxproj | 2 ++ 2 files changed, 2 insertions(+) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 6d458855525f4c304e2dfed3f2a486a2f4f940ac..5c18c80c1dd4442d4f770272bd75f1bd5f2c2264 100644 GIT binary patch delta 92 zcmcZ>buDVcFE&Qw%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT?Lr=a delta 92 zcmcZ>buDVcFE&P_%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT>(Cx} diff --git a/EgtGraphics.vcxproj b/EgtGraphics.vcxproj index 3c3b83e..8567d23 100644 --- a/EgtGraphics.vcxproj +++ b/EgtGraphics.vcxproj @@ -108,6 +108,7 @@ CompileAsCpp + stdcpp17 Windows @@ -170,6 +171,7 @@ copy $(TargetPath) \EgtProg\DllD64 true true Use + stdcpp17 Windows From 327e8bcf2afd6d25d535da7651669a3f88d97600 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 23 Mar 2023 10:05:22 +0100 Subject: [PATCH 09/11] EgtGraphics 2.5c1 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11606 -> 11606 bytes EgtGraphics.vcxproj | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 5c18c80c1dd4442d4f770272bd75f1bd5f2c2264..ba7804c409782c16a30508fe792e094887b20c40 100644 GIT binary patch delta 116 zcmcZ>buDVcH#Syd1|0^&%?J7RGfm>rnOvZ#!ki4`UzDt5+}y@(#tfI&W`;^sGj7fj SHo+pXo&~NLi(vxFZd?Eh6Crp2 delta 116 zcmcZ>buDVcH#Sxy1|0_D%?J7RGfm>rnOvZ#!kh%;UzDt5+}y@(#tfI&W`;^sGj7fj SHo+pXo&~NLi(vxFZd?Eiy&-@A diff --git a/EgtGraphics.vcxproj b/EgtGraphics.vcxproj index 8567d23..3ddf4be 100644 --- a/EgtGraphics.vcxproj +++ b/EgtGraphics.vcxproj @@ -22,7 +22,7 @@ {4EC970B1-B4D9-4088-8A31-B462CF72116E} Win32Proj EgtGraphics - 10.0.17763.0 + 10.0.20348.0 From 9384f8f0df679c636e5c849e1f4b792fff9c0238 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 11 Apr 2023 19:36:35 +0200 Subject: [PATCH 10/11] EgtGraphics 2.5d3 : - ricompilazione con cambio versione. --- EgtGraphics.rc | Bin 11606 -> 11606 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index ba7804c409782c16a30508fe792e094887b20c40..08778f84aa85f3d950a5b4cd013a62c670eae14c 100644 GIT binary patch delta 116 zcmcZ>buDVcH#Sxi1|0_D%?J7RGfm>rnOvZ#!khx+UzDt5+}y@(#tfI&W`;^sGj7fj SHo+pXo&~NLi(vxFZd?EmaUqZZ delta 116 zcmcZ>buDVcH#Syd1|0^&%?J7RGfm>rnOvZ#!ki4`UzDt5+}y@(#tfI&W`;^sGj7fj SHo+pXo&~NLi(vxFZd?Eh6Crp2 From 59ddf028879536f921b749fa59dc460757d9f911 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 20 Apr 2023 16:15:03 +0200 Subject: [PATCH 11/11] EgtGraphics 2.5d4 : - gli oggetti Frame3d ora sono visualizzati con assi lunghi 40 (contro i 10 di prima). --- EgtGraphics.rc | Bin 11606 -> 11606 bytes SceneGeom.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtGraphics.rc b/EgtGraphics.rc index 08778f84aa85f3d950a5b4cd013a62c670eae14c..793f481184d03325d6564eb3eec637767fa42ee6 100644 GIT binary patch delta 92 zcmcZ>buDVcFE&P#%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT?zA3= delta 92 zcmcZ>buDVcFE&Qw%?J7RGfm>rnOvZ#2IO6otYqBW#%;w6meB=K7bUA1H)jc3pa^Yd L!LC(6*^LVT?Lr=a diff --git a/SceneGeom.cpp b/SceneGeom.cpp index 4c31ff1..adbe088 100644 --- a/SceneGeom.cpp +++ b/SceneGeom.cpp @@ -301,7 +301,7 @@ Scene::DrawGeoObj( const IGdbIterator& iIter, int nPass, const MdStMkCol& siObj) return false ; // aggiorno la grafica (colori speciali) PolyLine plX, plY, plZ ; - pFrame->GetDrawWithArrowHeads( 10, 0.1, plX, plY, plZ) ; + pFrame->GetDrawWithArrowHeads( 40, 0.1, plX, plY, plZ) ; pGraphics->Clear() ; pGraphics->AddColor( RED) ; pGraphics->AddPolyLine( plX) ;