From 467c939fa20ca87d648f141f0497d756ebf92185 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 14 Jan 2016 17:39:03 +0000 Subject: [PATCH] TestEIn 1.6l8 : - aggiornamento per nesting. --- EgtInterface.vb | 148 ++++++++++++++++++++++++++++--------- My Project/AssemblyInfo.vb | 4 +- 2 files changed, 114 insertions(+), 38 deletions(-) diff --git a/EgtInterface.vb b/EgtInterface.vb index 56b36eb..22dee7d 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -5209,34 +5209,6 @@ Public Function EgtMoveSelectedPartCluster(ByVal bReducedCut As Boolean, ByRef v End If End Function - -Private Function EgtGetObstacleTangent_32(ByRef vtTang As Vector3d) As Boolean -End Function - -Private Function EgtGetObstacleTangent_64(ByRef vtTang As Vector3d) As Boolean -End Function -Public Function EgtGetObstacleTangent(ByRef vtTang As Vector3d) As Boolean - If IntPtr.Size = 4 Then - Return EgtGetObstacleTangent_32(vtTang) - Else - Return EgtGetObstacleTangent_64(vtTang) - End If -End Function - - -Private Function EgtGetMovingTangent_32(ByRef vtTang As Vector3d) As Boolean -End Function - -Private Function EgtGetMovingTangent_64(ByRef vtTang As Vector3d) As Boolean -End Function -Public Function EgtGetMovingTangent(ByRef vtTang As Vector3d) As Boolean - If IntPtr.Size = 4 Then - Return EgtGetMovingTangent_32(vtTang) - Else - Return EgtGetMovingTangent_64(vtTang) - End If -End Function - Private Function EgtRotatePartCluster_32(ByVal vId As Integer(), ByVal nCount As Integer, ByVal bReducedCut As Boolean, ByRef ptCen As Point3d, ByRef dRotAngDeg As Double, @@ -5271,40 +5243,144 @@ Public Function EgtRotateSelectedPartCluster(ByVal bReducedCut As Boolean, ByVal End If End Function + +Private Function EgtTgMovePartClusterOnCollision_32(ByVal vId As Integer(), ByVal nCount 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 +End Function + +Private Function EgtTgMovePartClusterOnCollision_64(ByVal vId As Integer(), ByVal nCount 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 +End Function +Public Function EgtTgMovePartClusterOnCollision(ByVal vId 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 + If IntPtr.Size = 4 Then + Return EgtTgMovePartClusterOnCollision_32(vId, vId.Count(), bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) + Else + 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 + If IntPtr.Size = 4 Then + Return EgtTgMovePartClusterOnCollision_32(vId, 1, bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) + Else + Return EgtTgMovePartClusterOnCollision_64(vId, 1, bReducedCut, vtMove, dXmin, dYmin, dXmax, dYmax) + End If +End Function + Private Function EgtAlignPartClusterOnCollision_32(ByVal vId As Integer(), ByVal nCount As Integer, ByVal bReducedCut As Boolean, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean End Function Private Function EgtAlignPartClusterOnCollision_64(ByVal vId As Integer(), ByVal nCount As Integer, ByVal bReducedCut As Boolean, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean End Function Public Function EgtAlignPartClusterOnCollision(ByVal vId As Integer(), ByVal bReducedCut As Boolean, ByVal dXmin As Double, ByVal dYmin As Double, - ByVal dXmax As Double, ByVal dYmax As Double) As Boolean + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean If IntPtr.Size = 4 Then - Return EgtAlignPartClusterOnCollision_32(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax) + Return EgtAlignPartClusterOnCollision_32(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax, bMoved) Else - Return EgtAlignPartClusterOnCollision_64(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax) + 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) As Boolean + ByVal dXmax As Double, ByVal dYmax As Double, + ByRef bMoved As Boolean) As Boolean Dim vId(1) As Integer vId(0) = GDB_ID.SEL If IntPtr.Size = 4 Then - Return EgtAlignPartClusterOnCollision_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax) + Return EgtAlignPartClusterOnCollision_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bMoved) Else - Return EgtAlignPartClusterOnCollision_64(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax) + Return EgtAlignPartClusterOnCollision_64(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bMoved) End If End Function + +Private Function EgtMoveToSnapPointOnCollision_32(ByVal vId As Integer(), ByVal nCount 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 +End Function + +Private Function EgtMoveToSnapPointOnCollision_64(ByVal vId As Integer(), ByVal nCount 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 +End Function +Public Function EgtMoveToSnapPointOnCollision(ByVal vId 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 + If IntPtr.Size = 4 Then + Return EgtMoveToSnapPointOnCollision_32(vId, vId.Count(), bReducedCut, dMaxMove, dXmin, dYmin, dXmax, dYmax, bMoved) + Else + 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 + If IntPtr.Size = 4 Then + Return EgtMoveToSnapPointOnCollision_32(vId, 1, bReducedCut, dMaxMove, dXmin, dYmin, dXmax, dYmax, bMoved) + Else + Return EgtMoveToSnapPointOnCollision_64(vId, 1, bReducedCut, dMaxMove, dXmin, dYmin, dXmax, dYmax, bMoved) + End If +End Function + + +Private Sub EgtSaveCollInfo_32() +End Sub + +Private Sub EgtSaveCollInfo_64() +End Sub +Public Sub EgtSaveCollInfo() + If IntPtr.Size = 4 Then + EgtSaveCollInfo_32() + Else + EgtSaveCollInfo_64() + End If +End Sub + + +Private Sub EgtRestoreCollInfo_32() +End Sub + +Private Sub EgtRestoreCollInfo_64() +End Sub +Public Sub EgtRestoreCollInfo() + If IntPtr.Size = 4 Then + EgtRestoreCollInfo_32() + Else + EgtRestoreCollInfo_64() + End If +End Sub + Private Function EgtGetPartClusterCenterGlob_32(ByVal vId As Integer(), ByVal nCount As Integer, ByRef ptCen As Point3d) As Boolean End Function diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 0d576b6..83b793d 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +