[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [688] delete contrib/py/scripts/addons/ space_view3d_cursor_to_edge_intersection.py

Brendon Murphy meta.androcto1 at gmail.com
Mon May 24 18:40:22 CEST 2010


Revision: 688
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=688
Author:   meta-androcto
Date:     2010-05-24 18:40:21 +0200 (Mon, 24 May 2010)

Log Message:
-----------
delete contrib/py/scripts/addons/space_view3d_cursor_to_edge_intersection.py
add cursor to edge intersection to editmode cursor menu in trunk/py/scripts/addons/space_view3d_spacebar_menu.py

Modified Paths:
--------------
    trunk/py/scripts/addons/space_view3d_spacebar_menu.py

Removed Paths:
-------------
    contrib/py/scripts/addons/space_view3d_cursor_to_edge_intersection.py

Deleted: contrib/py/scripts/addons/space_view3d_cursor_to_edge_intersection.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_cursor_to_edge_intersection.py	2010-05-24 15:16:11 UTC (rev 687)
+++ contrib/py/scripts/addons/space_view3d_cursor_to_edge_intersection.py	2010-05-24 16:40:21 UTC (rev 688)
@@ -1,146 +0,0 @@
-# cursor_to_edge_intersection.py Copyright (C) 2009-2010, Keith (Wahooney) Boshoff
-# parts based on Paul Bourke's Shortest Line Between 2 lines
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-
-bl_addon_info = {
-    'name': '3D View: Cursor to Edge Intersection',
-    'author': 'Keith (Wahooney) Boshoff',
-    'version': '1.0',
-    'blender': (2, 5, 3),
-    'location': 'Snap',
-    'description': 'adds Snap cursor to edge intersect to cursor tools',
-    'url': '',
-    'category': '3D View'}
-
-from mathutils import Vector, Matrix
-import math
-import bpy
-
-def abs(val):
-    if val > 0:
-        return val
-    return -val
-
-def LineLineIntersect (p1, p2, p3, p4):
-    # based on Paul Bourke's Shortest Line Between 2 lines
-    
-    min = 0.0000001
-    
-    v1 = Vector((p1.x - p3.x, p1.y - p3.y, p1.z - p3.z))
-    v2 = Vector((p4.x - p3.x, p4.y - p3.y, p4.z - p3.z))
-    
-    if abs(v2.x) < min and abs(v2.y) < min and abs(v2.z)  < min:
-        return None
-        
-    v3 = Vector((p2.x - p1.x, p2.y - p1.y, p2.z - p1.z))
-    
-    if abs(v3.x) < min and abs(v3.y) < min and abs(v3.z) < min:
-        return None
-
-    d1 = v1.dot(v2)
-    d2 = v2.dot(v3)
-    d3 = v1.dot(v3)
-    d4 = v2.dot(v2)
-    d5 = v3.dot(v3)
-
-    d = d5 * d4 - d2 * d2
-    
-    if abs(d) < min:
-        return None
-        
-    n = d1 * d2 - d3 * d4
-
-    mua = n / d
-    mub = (d1 + d2 * (mua)) / d4
-
-    return [Vector((p1.x + mua * v3.x, p1.y + mua * v3.y, p1.z + mua * v3.z)), 
-        Vector((p3.x + mub * v2.x, p3.y + mub * v2.y, p3.z + mub * v2.z))]
-
-def edgeIntersect(context, operator):
-    
-    obj = context.active_object
-    
-    if (obj.type != "MESH"):
-        operator.report({'ERROR'}, "Object must be a mesh")
-        return None
-    
-    edges = [];
-    mesh = obj.data
-    verts = mesh.verts
-
-    is_editmode = (obj.mode == 'EDIT')
-    if is_editmode:
-        bpy.ops.object.mode_set(mode='OBJECT')
-    
-    for e in mesh.edges:
-        if e.selected:
-            edges.append(e)
-
-    if is_editmode:
-        bpy.ops.object.mode_set(mode='EDIT')
-            
-    if len(edges) != 2:
-        operator.report({'ERROR'}, "Operator requires exactly 2 edges to be selected.")
-        return
-        
-    line = LineLineIntersect(verts[edges[0].verts[0]].co, verts[edges[0].verts[1]].co, verts[edges[1].verts[0]].co, verts[edges[1].verts[1]].co)
-
-    if (line == None):
-        operator.report({'ERROR'}, "Selected edges are parallel.")
-        return
-
-    tm = obj.matrix.copy()
-    point = ((line[0] + line[1]) / 2)
-    point = tm * point
-
-    context.scene.cursor_location = point
-            
-    return point
-    
-class CursorToEdgeIntersection(bpy.types.Operator):
-    '''Finds the mid-point of the shortest distance between two edges, the point may not lie
-    between the edges as the edges are projected beyond their bounds'''
-    
-    bl_idname = "view3d.snap_cursor_to_edge_intersection"
-    bl_label = "Cursor to Edge Intersection"
-
-    def poll(self, context):
-        obj = context.active_object
-        return obj != None and obj.type == 'MESH'
-
-    def execute(self, context):
-        edgeIntersect(context, self)
-        return {'FINISHED'}
-
-
-menu_func = (lambda self,
-            context: self.layout.operator(CursorToEdgeIntersection.bl_idname,
-            text="Cursor to Edge intersection"))
-
-def register():
-    bpy.types.register(CursorToEdgeIntersection)
-    bpy.types.VIEW3D_MT_snap.append(menu_func)
-
-def unregister():
-    bpy.types.unregister(CursorToEdgeIntersection)
-    bpy.types.VIEW3D_MT_snap.append(menu_func)
-
-if __name__ == "__main__":
-    register()
\ No newline at end of file

Modified: trunk/py/scripts/addons/space_view3d_spacebar_menu.py
===================================================================
--- trunk/py/scripts/addons/space_view3d_spacebar_menu.py	2010-05-24 15:16:11 UTC (rev 687)
+++ trunk/py/scripts/addons/space_view3d_spacebar_menu.py	2010-05-24 16:40:21 UTC (rev 688)
@@ -68,34 +68,10 @@
 """
 import bpy
 from bpy import *
+from mathutils import Vector, Matrix
+import math
 
 
-# Classes for VIEW3D_MT_CursorMenu()
-class pivot_cursor(bpy.types.Operator):
-    bl_idname = "view3d.pivot_cursor"
-    bl_label = "Cursor as Pivot Point"
-
-    def poll(self, context):
-        return bpy.context.space_data.pivot_point != 'CURSOR'
-
-    def execute(self, context):
-        bpy.context.space_data.pivot_point = 'CURSOR'
-        return {'FINISHED'}
-
-
-class revert_pivot(bpy.types.Operator):
-    bl_idname = "view3d.revert_pivot"
-    bl_label = "Reverts Pivot Point to median"
-
-    def poll(self, context):
-        return bpy.context.space_data.pivot_point != 'MEDIAN_POINT'
-
-    def execute(self, context):
-        bpy.context.space_data.pivot_point = 'MEDIAN_POINT'
-        # @todo Change this to 'BOUDNING_BOX_CENTER' if needed...
-        return{'FINISHED'}
-
-
 # Dynamic Menu
 class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
     bl_label = "Dynamic Spacebar Menu"
@@ -184,7 +160,7 @@
             layout.separator()
 
             # Cursor block
-            layout.menu("VIEW3D_MT_CursorMenu", icon='CURSOR')
+            layout.menu("VIEW3D_MT_EditCursorMenu", icon='CURSOR')
             layout.separator()
 
             # Edit block
@@ -1259,6 +1235,32 @@
             text="Change Keying Set...")
         layout.separator()
 
+# Classes for VIEW3D_MT_CursorMenu()
+class VIEW3D_OT_pivot_cursor(bpy.types.Operator):
+    "Cursor as Pivot Point"
+    bl_idname = "view3d.pivot_cursor"
+    bl_label = "Cursor as Pivot Point"
+
+    def poll(self, context):
+        return bpy.context.space_data.pivot_point != 'CURSOR'
+
+    def execute(self, context):
+        bpy.context.space_data.pivot_point = 'CURSOR'
+        return {'FINISHED'}
+
+class VIEW3D_OT_revert_pivot(bpy.types.Operator):
+    "Revert Pivot Point"
+    bl_idname = "view3d.revert_pivot"
+    bl_label = "Reverts Pivot Point to median"
+
+    def poll(self, context):
+        return bpy.context.space_data.pivot_point != 'MEDIAN_POINT'
+
+    def execute(self, context):
+        bpy.context.space_data.pivot_point = 'MEDIAN_POINT'
+        # @todo Change this to 'BOUDNING_BOX_CENTER' if needed...
+        return{'FINISHED'}
+
 class VIEW3D_MT_CursorMenu(bpy.types.Menu):
     bl_label = "Snap Cursor Menu"
 
@@ -1285,6 +1287,130 @@
         layout.operator("view3d.revert_pivot",
             text="Revert Pivot Point")
 
+class VIEW3D_MT_EditCursorMenu(bpy.types.Menu):
+    bl_label = "Snap Cursor Menu"
+
+    def draw(self, context):
+
+        layout = self.layout
+        layout.operator_context = 'INVOKE_REGION_WIN'
+        layout.operator("view3d.snap_cursor_to_selected",
+            text="Cursor to Selected")
+        layout.operator("view3d.snap_cursor_to_center",
+            text="Cursor to Center")
+        layout.operator("view3d.snap_cursor_to_grid",
+            text="Cursor to Grid")
+        layout.operator("view3d.snap_cursor_to_active",
+            text="Cursor to Active")
+        layout.separator()
+        layout.operator("view3d.snap_selected_to_cursor",
+            text="Selection to Cursor")
+        layout.operator("view3d.snap_selected_to_grid",
+            text="Selection to Grid")
+        layout.separator()
+        layout.operator("view3d.pivot_cursor",
+            text="Set Cursor as Pivot Point")
+        layout.operator("view3d.revert_pivot",
+            text="Revert Pivot Point")
+        layout.operator("view3d.snap_cursor_to_edge_intersection",
+            text="Cursor to Edge Intersection")
+
+def abs(val):
+    if val > 0:
+        return val
+    return -val
+
+def LineLineIntersect (p1, p2, p3, p4):
+    # based on Paul Bourke's Shortest Line Between 2 lines
+    
+    min = 0.0000001
+    
+    v1 = Vector((p1.x - p3.x, p1.y - p3.y, p1.z - p3.z))
+    v2 = Vector((p4.x - p3.x, p4.y - p3.y, p4.z - p3.z))
+    
+    if abs(v2.x) < min and abs(v2.y) < min and abs(v2.z)  < min:
+        return None
+        
+    v3 = Vector((p2.x - p1.x, p2.y - p1.y, p2.z - p1.z))
+    
+    if abs(v3.x) < min and abs(v3.y) < min and abs(v3.z) < min:
+        return None
+
+    d1 = v1.dot(v2)
+    d2 = v2.dot(v3)
+    d3 = v1.dot(v3)
+    d4 = v2.dot(v2)
+    d5 = v3.dot(v3)
+
+    d = d5 * d4 - d2 * d2
+    
+    if abs(d) < min:
+        return None
+        
+    n = d1 * d2 - d3 * d4
+
+    mua = n / d
+    mub = (d1 + d2 * (mua)) / d4
+
+    return [Vector((p1.x + mua * v3.x, p1.y + mua * v3.y, p1.z + mua * v3.z)), 
+        Vector((p3.x + mub * v2.x, p3.y + mub * v2.y, p3.z + mub * v2.z))]
+
+def edgeIntersect(context, operator):
+    
+    obj = context.active_object
+    
+    if (obj.type != "MESH"):
+        operator.report({'ERROR'}, "Object must be a mesh")
+        return None
+    
+    edges = [];
+    mesh = obj.data
+    verts = mesh.verts
+
+    is_editmode = (obj.mode == 'EDIT')
+    if is_editmode:
+        bpy.ops.object.mode_set(mode='OBJECT')
+    
+    for e in mesh.edges:
+        if e.selected:
+            edges.append(e)
+
+    if is_editmode:
+        bpy.ops.object.mode_set(mode='EDIT')
+            
+    if len(edges) != 2:
+        operator.report({'ERROR'}, "Operator requires exactly 2 edges to be selected.")
+        return
+        

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list