Compare commits

...

14 Commits

Author SHA1 Message Date
Riccardo Elitropi c5db0ed4ad Include :
- aggiunta funzione rimossa dal merge.
2024-03-04 15:14:02 +01:00
Riccardo Elitropi d4e6fd0749 Include :
- rimozione funzioni dopo il merge.
2024-03-04 14:58:56 +01:00
Riccardo Elitropi 03be35f48b Merge commit '6d06630d0a8599681c5e206f3c38402ab65e6f22' into Cube 2024-03-04 14:24:56 +01:00
Riccardo Elitropi ae036de6e5 Merge commit 'fdb7209f3fe555f23f268a1c9e2a22c4c235142e' into Cube 2023-08-22 09:42:39 +02:00
Riccardo Elitropi 56e27b377f Merge commit '63c5f940d8ed16586091e592245ccb00e1c697d1' into Cube 2023-08-10 12:41:25 +02:00
Riccardo Elitropi 132edaaa35 Merge commit '1599910667a09c04ff861b5a8429d024ddd2730e' into Cube 2023-07-28 17:04:37 +02:00
Riccardo Elitropi ce380c220e Merge commit '340d11635dfad4abb3d707c4d55f269ab03f2d41' into Cube 2023-07-26 12:26:19 +02:00
Riccardo Elitropi 6e15145bf0 Include :
- merge con Master.
2023-07-10 11:44:51 +02:00
Riccardo Elitropi 37cafd5cf7 Merge commit '3106768d3941a9de8f6debe2bd6bad84c857fc6e' into Cube 2023-07-10 11:20:36 +02:00
Riccardo Elitropi 8b8cc36ebd Revert "Merge commit '880f586861f34191c711bc6e3c18069a3b399f7f' into Cube"
This reverts commit c0c9772dfa, reversing
changes made to c4f4e33d1f.
2023-07-10 11:10:46 +02:00
Riccardo Elitropi c0c9772dfa Merge commit '880f586861f34191c711bc6e3c18069a3b399f7f' into Cube 2023-07-10 11:07:45 +02:00
Riccardo Elitropi c4f4e33d1f Include :
- ricompilazione.
2023-06-30 09:42:23 +02:00
Riccardo Elitropi 7c4b3f33d8 Merge commit '33cd3aa310fda39ded0460f5f976cf9c4776a241' into Cube 2023-06-30 09:09:33 +02:00
Riccardo Elitropi dd6b3ea190 Include :
- prototipi Cubetto, Frame, Griglia, Zoom.
2023-06-01 13:11:22 +02:00
3 changed files with 15 additions and 2 deletions
+3 -1
View File
@@ -16,6 +16,7 @@
#include "/EgtDev/Include/EGkPointGrid3d.h"
#include "/EgtDev/Include/EGkGeoCollection.h"
#include <unordered_set>
class IGeomDB ;
@@ -58,6 +59,7 @@ class ChainCurves
EGK_EXPORT bool GetForkIds( INTVECTOR& vForkIds) ;
private :
typedef std::unordered_set<int> INTUSET ;
struct CrvData {
int nId ;
Point3d ptStart ;
@@ -90,7 +92,7 @@ class ChainCurves
private :
bool m_bAllowInvert ;
double m_dToler ;
INTUNORDSET m_sCrvId ;
INTUSET m_sCrvId ;
CRVDATAVECTOR m_vCrvData ;
PointGrid3d m_PointGrid ;
bool m_bFromNear ;
+1 -1
View File
@@ -62,4 +62,4 @@ class DistPointSurfTm
//----------------------------------------------------------------------------
// Calcola l'indice del vertice della superficie a minima distanza dal punto di riferimento.
//----------------------------------------------------------------------------
EGK_EXPORT int GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf) ;
EGK_EXPORT int GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf) ;
+11
View File
@@ -19,6 +19,7 @@
#include "/EgtDev/Include/EGkPlane3d.h"
#include "/EgtDev/Include/EGkColor.h"
#include "/EgtDev/Include/EgtNumCollection.h"
#include "/EgtDev/Include/EGkSurfTriMesh.h"
#define NOMINMAX
#include <windows.h>
#include <string>
@@ -55,6 +56,8 @@ class IEGrScene
virtual bool Project( const Point3d& ptWorld, Point3d& ptView) const = 0 ;
virtual bool UnProject( const Point3d& ptView, Point3d& ptWorld) const = 0 ;
virtual void Destroy( void) = 0 ;
virtual void SetSceneColors( Color cColX, Color cColY, Color cColZ, Color cColXm, Color cColYm, Color cColZm,
Color cColEdge, Color cColCorner) = 0 ;
// Camera
virtual bool SetCenter( const Point3d& ptCenter) = 0 ;
virtual bool SetCameraDirOrizzOffset( int nRightStepOffset = 0) = 0 ;
@@ -102,6 +105,14 @@ class IEGrScene
virtual bool GetShowGrid( void) = 0 ;
// Glob Frame
virtual bool SetGlobFrameShow( bool bShow) = 0 ;
virtual bool SetGlobFrameParameters( int nPosFlag, double dDistX, double dDistY,
double dLenLine, double dWidthLine) = 0 ;
// Glob Cube
virtual bool DrawCube( bool bSurf) = 0 ;
virtual bool CreateFlatPart( ISurfTriMesh* pSrf) = 0 ;
virtual bool CreateEdgePart( ISurfTriMesh* pSrf) = 0 ;
virtual bool CreateCornerPart( ISurfTriMesh* pSrf) = 0 ;
virtual bool SetGlobCubeParameters( int nPosFlag, double dDistX, double dDistY, double dLenEdge) = 0 ;
// Direct
virtual bool SetGeoLineAttribs( Color GLcol) = 0 ;
virtual bool SetGeoLine( const Point3d& ptP1, const Point3d& ptP2) = 0 ;