From 7f6f407c2d5619c27f37f2ac779f9d60b2ce8eab Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 21 Jan 2016 12:04:20 +0000 Subject: [PATCH] TestEIn : - aggiornamento. --- EgtInterface.vb | 107 +++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/EgtInterface.vb b/EgtInterface.vb index 7f2d1dd..5f34d04 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -5013,20 +5013,17 @@ Public Function EgtCreateFlatParts(ByVal nType As Integer) As Boolean End If End Function - -Private Function EgtPackBox_32(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double, ByVal bBottomUp As Boolean) As Boolean + +Private Function EgtAdjustFlatPartLayer_32(ByVal nLayerId As Integer) As Boolean End Function - -Private Function EgtPackBox_64(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double, ByVal bBottomUp As Boolean) As Boolean + +Private Function EgtAdjustFlatPartLayer_64(ByVal nLayerId As Integer) As Boolean End Function -Public Function EgtPackBox(ByVal nId As Integer, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double, ByVal bBottomUp As Boolean) As Boolean +Public Function EgtAdjustFlatPartLayer(ByVal nLayerId As Integer) As Boolean If IntPtr.Size = 4 Then - Return EgtPackBox_32(nId, dXmin, dYmin, dXmax, dYmax, dOffs, bBottomUp) + Return EgtAdjustFlatPartLayer_32(nLayerId) Else - Return EgtPackBox_64(nId, dXmin, dYmin, dXmax, dYmax, dOffs, bBottomUp) + Return EgtAdjustFlatPartLayer_64(nLayerId) End If End Function @@ -5046,10 +5043,10 @@ Public Function EgtPackBoxCluster(ByVal vId As Integer(), ByVal dXmin As Double, Return EgtPackBoxCluster_64(vId, vId.Count(), dXmin, dYmin, dXmax, dYmax, dOffs, bBottomUp) End If End Function -Public Function EgtPackSelectedBoxCluster(ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double, ByVal bBottomUp As Boolean) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtPackBox(ByVal nPartId As Integer, ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double, ByVal bBottomUp As Boolean) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtPackBoxCluster_32(vId, 1, dXmin, dYmin, dXmax, dYmax, dOffs, bBottomUp) Else @@ -5076,10 +5073,10 @@ Public Function EgtMoveBoxCluster(ByVal vId As Integer(), ByRef vtMove As Vector Return EgtMoveBoxCluster_64(vId, vId.Count(), vtMove, dXmin, dYmin, dXmax, dYmax, dOffs) End If End Function -Public Function EgtMoveSelectedBoxCluster(ByRef vtMove As Vector3d, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtMoveBox(ByVal nPartId As Integer, ByRef vtMove As Vector3d, ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double, ByVal dOffs As Double) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtMoveBoxCluster_32(vId, 1, vtMove, dXmin, dYmin, dXmax, dYmax, dOffs) Else @@ -5103,9 +5100,9 @@ Public Function EgtGetClusterBBoxGlob(ByVal vId As Integer(), Return EgtGetClusterBBoxGlob_64(vId, vId.Count(), PtMin, PtMax) End If End Function -Public Function EgtGetSelectedClusterBBoxGlob(ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtGetPartBBoxGlob(ByVal nPartId As Integer, ByRef PtMin As Point3d, ByRef PtMax As Point3d) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtGetClusterBBoxGlob_32(vId, 1, PtMin, PtMax) Else @@ -5132,11 +5129,11 @@ Public Function EgtVerifyPartCluster(ByVal vId As Integer(), ByVal bReducedCut A Return EgtVerifyPartCluster_64(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax) End If End Function -Public Function EgtVerifySelectedPartCluster(ByVal bReducedCut As Boolean, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtVerifyPart(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtVerifyPartCluster_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax) Else @@ -5166,7 +5163,7 @@ End Function Public Function EgtPackPart(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, ByVal dXmin As Double, ByVal dYmin As Double, ByVal dXmax As Double, ByVal dYmax As Double, ByVal bBottomUp As Boolean) As Boolean - Dim vId(1) As Integer + Dim vId(0) As Integer vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtPackPartCluster_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bBottomUp) @@ -5197,11 +5194,11 @@ Public Function EgtMovePartCluster(ByVal vId As Integer(), Return EgtMovePartCluster_64(vId, vId.Count(), bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) End If End Function -Public Function EgtMoveSelectedPartCluster(ByVal bReducedCut As Boolean, ByRef vtMove As Vector3d, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtMovePart(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, ByRef vtMove As Vector3d, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtMovePartCluster_32(vId, 1, bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) Else @@ -5231,11 +5228,11 @@ Public Function EgtRotatePartCluster(ByVal vId As Integer(), Return EgtRotatePartCluster_64(vId, vId.Count(), bReducedCut, ptCen, dRotAngDeg, dXmin, dYmin, dXmax, dYmax) End If End Function -Public Function EgtRotateSelectedPartCluster(ByVal bReducedCut As Boolean, ByVal ptCen As Point3d, ByRef dRotAngDeg As Double, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtRotatePart(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, ByVal ptCen As Point3d, ByRef dRotAngDeg As Double, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtRotatePartCluster_32(vId, 1, bReducedCut, ptCen, dRotAngDeg, dXmin, dYmin, dXmax, dYmax) Else @@ -5265,11 +5262,11 @@ Public Function EgtTgMovePartClusterOnCollision(ByVal vId As Integer(), Return EgtTgMovePartClusterOnCollision_64(vId, vId.Count(), bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) End If End Function -Public Function EgtTgMoveSelectedPartClusterOnCollision(ByVal bReducedCut As Boolean, ByRef vtMove As Vector3d, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtTgMovePartOnCollision(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, ByRef vtMove As Vector3d, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtTgMovePartClusterOnCollision_32(vId, 1, bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) Else @@ -5302,12 +5299,12 @@ Public Function EgtAlignPartClusterOnCollision(ByVal vId As Integer(), Return EgtAlignPartClusterOnCollision_64(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax, bMoved) End If End Function -Public Function EgtAlignSelectedPartClusterOnCollision(ByVal bReducedCut As Boolean, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, - ByRef bMoved As Boolean) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtAlignPartOnCollision(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtAlignPartClusterOnCollision_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bMoved) Else @@ -5340,12 +5337,12 @@ Public Function EgtMoveToSnapPointOnCollision(ByVal vId As Integer(), Return EgtMoveToSnapPointOnCollision_64(vId, vId.Count(), bReducedCut, dMaxMove, dXmin, dYmin, dXmax, dYmax, bMoved) End If End Function -Public Function EgtMoveToSnapPointSelectedOnCollision(ByVal bReducedCut As Boolean, ByVal dMaxMove As Double, - ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double, - ByRef bMoved As Boolean) As Boolean - Dim vId(1) As Integer - vId(0) = GDB_ID.SEL +Public Function EgtMovePartToSnapPointOnCollision(ByVal nPartId As Integer, ByVal bReducedCut As Boolean, ByVal dMaxMove As Double, + ByVal dXmin As Double, ByVal dYmin As Double, + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean + Dim vId(0) As Integer + vId(0) = nPartId If IntPtr.Size = 4 Then Return EgtMoveToSnapPointOnCollision_32(vId, 1, bReducedCut, dMaxMove, dXmin, dYmin, dXmax, dYmax, bMoved) Else @@ -5395,7 +5392,7 @@ Public Function EgtGetPartClusterCenterGlob(ByVal vId As Integer(), ByVal ptCen End If End Function Public Function EgtGetSelectedPartClusterCenterGlob(ByRef ptCen As Point3d) As Boolean - Dim vId(1) As Integer + Dim vId(0) As Integer vId(0) = GDB_ID.SEL If IntPtr.Size = 4 Then Return EgtGetPartClusterCenterGlob_32(vId, 1, ptCen)