[Bf-extensions-cvs] [67d16882] master: Curve Tools 2: Update addon to Blender 2.80

Spivak Vladimir cwolf3d noreply at git.blender.org
Sun May 26 00:20:42 CEST 2019


Commit: 67d1688276f5d5dc9a943fa63352d89e43063cd5
Author: Spivak Vladimir (cwolf3d)
Date:   Sun May 26 01:19:10 2019 +0300
Branches: master
https://developer.blender.org/rBAC67d1688276f5d5dc9a943fa63352d89e43063cd5

Curve Tools 2: Update addon to Blender 2.80

===================================================================

M	curve_tools/CurveIntersections.py
M	curve_tools/Operators.py
M	curve_tools/Surfaces.py
M	curve_tools/__init__.py
M	curve_tools/curve_outline.py
A	curve_tools/curve_remove_doubles.py

===================================================================

diff --git a/curve_tools/CurveIntersections.py b/curve_tools/CurveIntersections.py
index 0c8da2a4..06254701 100644
--- a/curve_tools/CurveIntersections.py
+++ b/curve_tools/CurveIntersections.py
@@ -49,14 +49,14 @@ class BezierSegmentsIntersector:
         for iSample1 in range(nrSamples1):
             segPar10 = float(iSample1) / fltNrSamples1
             segPar11 = float(iSample1 + 1) / fltNrSamples1
-            P0 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar10)
-            P1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar11)
+            P0 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar10)
+            P1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar11)
 
             for iSample2 in range(nrSamples2):
                 segPar20 = float(iSample2) / fltNrSamples2
                 segPar21 = float(iSample2 + 1) / fltNrSamples2
-                Q0 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar20)
-                Q1 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar21)
+                Q0 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar20)
+                Q1 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar21)
 
                 intersectionPointData = Math.CalcIntersectionPointLineSegments(P0, P1, Q0, Q1, limitDistance)
                 if intersectionPointData is None:
@@ -85,14 +85,14 @@ class BezierSegmentsIntersector:
         for iSample1 in range(nrSamples1):
             segPar10 = float(iSample1) / fltNrSamples1
             segPar11 = float(iSample1 + 1) / fltNrSamples1
-            P0 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar10)
-            P1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar11)
+            P0 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar10)
+            P1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar11)
 
             for iSample2 in range(nrSamples2):
                 segPar20 = float(iSample2) / fltNrSamples2
                 segPar21 = float(iSample2 + 1) / fltNrSamples2
-                Q0 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar20)
-                Q1 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar21)
+                Q0 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar20)
+                Q1 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar21)
 
                 intersectionPointData = Math.CalcIntersectionPointLineSegments(P0, P1, Q0, Q1, limitDistance)
                 if intersectionPointData is None:
@@ -100,7 +100,7 @@ class BezierSegmentsIntersector:
 
                 # intersection point can't be an existing point
                 intersectionSegment1Parameter = segPar10 + (intersectionPointData[0] / (fltNrSamples1))
-                worldPoint1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
+                worldPoint1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
                 if (Math.IsSamePoint(P0, worldPoint1, limitDistance)) or \
                    (Math.IsSamePoint(P1, worldPoint1, limitDistance)):
 
@@ -111,7 +111,7 @@ class BezierSegmentsIntersector:
                                                                         worldPoint1)
 
                 intersectionSegment2Parameter = segPar20 + (intersectionPointData[1] / (fltNrSamples2))
-                worldPoint2 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
+                worldPoint2 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
                 if (Math.IsSamePoint(Q0, worldPoint2, limitDistance)) or \
                    (Math.IsSamePoint(Q1, worldPoint2, limitDistance)):
 
@@ -134,27 +134,27 @@ class BezierSegmentsIntersector:
         for iSample1 in range(nrSamples1):
             segPar10 = float(iSample1) / fltNrSamples1
             segPar11 = float(iSample1 + 1) / fltNrSamples1
-            P0 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar10)
-            P1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar11)
+            P0 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar10)
+            P1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar11)
 
             for iSample2 in range(nrSamples2):
                 segPar20 = float(iSample2) / fltNrSamples2
                 segPar21 = float(iSample2 + 1) / fltNrSamples2
-                Q0 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar20)
-                Q1 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar21)
+                Q0 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar20)
+                Q1 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar21)
 
                 intersectionPointData = Math.CalcIntersectionPointsLineSegmentsDIR(P0, P1, Q0, Q1, algoDIR)
                 if intersectionPointData is None:
                     continue
 
                 intersectionSegment1Parameter = segPar10 + (intersectionPointData[0] / fltNrSamples1)
-                worldPoint1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
+                worldPoint1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
                 intersectionPoint1 = BezierSegmentIntersectionPoint(self.segment1,
                                                                     intersectionSegment1Parameter,
                                                                     worldPoint1)
 
                 intersectionSegment2Parameter = segPar20 + (intersectionPointData[1] / fltNrSamples2)
-                worldPoint2 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
+                worldPoint2 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
                 intersectionPoint2 = BezierSegmentIntersectionPoint(self.segment2,
                                                                     intersectionSegment2Parameter,
                                                                     worldPoint2)
@@ -174,14 +174,14 @@ class BezierSegmentsIntersector:
         for iSample1 in range(nrSamples1):
             segPar10 = float(iSample1) / fltNrSamples1
             segPar11 = float(iSample1 + 1) / fltNrSamples1
-            P0 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar10)
-            P1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar11)
+            P0 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar10)
+            P1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar11)
 
             for iSample2 in range(nrSamples2):
                 segPar20 = float(iSample2) / fltNrSamples2
                 segPar21 = float(iSample2 + 1) / fltNrSamples2
-                Q0 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar20)
-                Q1 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar21)
+                Q0 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar20)
+                Q1 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar21)
 
                 intersectionPointData = Math.CalcIntersectionPointsLineSegmentsDIR(P0, P1, Q0, Q1, algoDIR)
                 if intersectionPointData is None:
@@ -189,7 +189,7 @@ class BezierSegmentsIntersector:
 
                 # intersection point can't be an existing point
                 intersectionSegment1Parameter = segPar10 + (intersectionPointData[0] / (fltNrSamples1))
-                worldPoint1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
+                worldPoint1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=intersectionSegment1Parameter)
                 if (Math.IsSamePoint(P0, worldPoint1, limitDistance)) or \
                    (Math.IsSamePoint(P1, worldPoint1, limitDistance)):
 
@@ -200,7 +200,7 @@ class BezierSegmentsIntersector:
                                                                         worldPoint1)
 
                 intersectionSegment2Parameter = segPar20 + (intersectionPointData[1] / (fltNrSamples2))
-                worldPoint2 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
+                worldPoint2 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=intersectionSegment2Parameter)
                 if (Math.IsSamePoint(Q0, worldPoint2, limitDistance)) or \
                    (Math.IsSamePoint(Q1, worldPoint2, limitDistance)):
 
@@ -223,27 +223,27 @@ class BezierSegmentsIntersector:
         for iSample1 in range(nrSamples1):
             segPar10 = float(iSample1) / fltNrSamples1
             segPar11 = float(iSample1 + 1) / fltNrSamples1
-            P0 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar10)
-            P1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=segPar11)
+            P0 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar10)
+            P1 = self.worldMatrix1 @ self.segment1.CalcPoint(parameter=segPar11)
 
             for iSample2 in range(nrSamples2):
                 segPar20 = float(iSample2) / fltNrSamples2
                 segPar21 = float(iSample2 + 1) / fltNrSamples2
-                Q0 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar20)
-                Q1 = self.worldMatrix2 * self.segment2.CalcPoint(parameter=segPar21)
+                Q0 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar20)
+                Q1 = self.worldMatrix2 @ self.segment2.CalcPoint(parameter=segPar21)
 
                 intersectionPointData = Math.CalcIntersectionPointsLineSegmentsPOV(P0, P1, Q0, Q1, algoPOV)
                 if intersectionPointData is None:
                     continue
 
                 intersectionSegment1Parameter = segPar10 + (intersectionPointData[0] / fltNrSamples1)
-                worldPoint1 = self.worldMatrix1 * self.segment1.CalcPoint(parameter=inte

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list