TestEIn 1.6l8 :

- aggiornamento per nesting.
This commit is contained in:
Dario Sassi
2016-01-14 17:39:03 +00:00
parent c73639e403
commit 467c939fa2
2 changed files with 114 additions and 38 deletions
+112 -36
View File
@@ -5209,34 +5209,6 @@ Public Function EgtMoveSelectedPartCluster(ByVal bReducedCut As Boolean, ByRef v
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetObstacleTangent")>
Private Function EgtGetObstacleTangent_32(ByRef vtTang As Vector3d) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetObstacleTangent")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMovingTangent")>
Private Function EgtGetMovingTangent_32(ByRef vtTang As Vector3d) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMovingTangent")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRotatePartCluster")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTgMovePartClusterOnCollision")>
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
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTgMovePartClusterOnCollision")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAlignPartClusterOnCollision")>
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
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtAlignPartClusterOnCollision")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtMoveToSnapPointOnCollision")>
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
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtMoveToSnapPointOnCollision")>
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
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSaveCollInfo")>
Private Sub EgtSaveCollInfo_32()
End Sub
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSaveCollInfo")>
Private Sub EgtSaveCollInfo_64()
End Sub
Public Sub EgtSaveCollInfo()
If IntPtr.Size = 4 Then
EgtSaveCollInfo_32()
Else
EgtSaveCollInfo_64()
End If
End Sub
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtRestoreCollInfo")>
Private Sub EgtRestoreCollInfo_32()
End Sub
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtRestoreCollInfo")>
Private Sub EgtRestoreCollInfo_64()
End Sub
Public Sub EgtRestoreCollInfo()
If IntPtr.Size = 4 Then
EgtRestoreCollInfo_32()
Else
EgtRestoreCollInfo_64()
End If
End Sub
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetPartClusterCenterGlob")>
Private Function EgtGetPartClusterCenterGlob_32(ByVal vId As Integer(), ByVal nCount As Integer, ByRef ptCen As Point3d) As Boolean
End Function
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.12.7")>
<Assembly: AssemblyFileVersion("1.6.12.7")>
<Assembly: AssemblyVersion("1.6.12.8")>
<Assembly: AssemblyFileVersion("1.6.12.8")>