[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1603] contrib/py/scripts/addons/ mesh_edge_intersection_tools.py: removed first part of redundantly similar code

Dealga McArdle tetha.z at gmail.com
Tue Feb 15 10:45:25 CET 2011


Revision: 1603
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1603
Author:   zeffii
Date:     2011-02-15 09:45:24 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
removed first part of redundantly similar code

Modified Paths:
--------------
    contrib/py/scripts/addons/mesh_edge_intersection_tools.py

Modified: contrib/py/scripts/addons/mesh_edge_intersection_tools.py
===================================================================
--- contrib/py/scripts/addons/mesh_edge_intersection_tools.py	2011-02-15 08:57:01 UTC (rev 1602)
+++ contrib/py/scripts/addons/mesh_edge_intersection_tools.py	2011-02-15 09:45:24 UTC (rev 1603)
@@ -164,25 +164,16 @@
 #   ProjectGeometry is used to extend two edges to their intersection point.
 def ProjectGeometry(vX, opoint):
 
-    def closest_vert(X, A, B):
+    def return_distance_checked(X, A, B):
         dist1 = mDist(X, A)
         dist2 = mDist(X, B)
         point_choice = min(dist1, dist2)
-        if point_choice == dist1: return A
-        else: return B
+        if point_choice == dist1: return A, B
+        else: return B, A
 
-    def furthest_vert(X, A, B):
-        dist1 = mDist(X, A)
-        dist2 = mDist(X, B)
-        point_choice = max(dist1, dist2)
-        if point_choice == dist1: return A
-        else: return B
-
     (o, vert_count, edge_count) =  GetActiveObject()
-    vA = closest_vert(vX, Vector((opoint[0][0])),Vector((opoint[0][1])))    # A
-    vB = furthest_vert(vX, Vector((opoint[0][0])),Vector((opoint[0][1])))   # B
-    vC = closest_vert(vX, Vector((opoint[1][0])),Vector((opoint[1][1])))    # C
-    vD = furthest_vert(vX, Vector((opoint[1][0])),Vector((opoint[1][1])))   # D
+    vA, vB = return_distance_checked(vX, Vector((opoint[0][0])),Vector((opoint[0][1])))
+    vC, vD = return_distance_checked(vX, Vector((opoint[1][0])),Vector((opoint[1][1])))
     AddVertsToObject(vert_count, o, vX, vA, vB, vC, vD)
 
     oe = o.data.edges



More information about the Bf-extensions-cvs mailing list