[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2447] trunk/py/scripts/addons/ add_mesh_BoltFactory: remove 'original_script_add_mesh_bolt.py', scripts for reference can be linked to by their svn revision rather than including .
Campbell Barton
ideasman42 at gmail.com
Sat Oct 15 08:43:55 CEST 2011
Revision: 2447
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2447
Author: campbellbarton
Date: 2011-10-15 06:43:51 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
remove 'original_script_add_mesh_bolt.py', scripts for reference can be linked to by their svn revision rather than including.
replace MATHUTILS with mathutils.
Modified Paths:
--------------
trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py
Removed Paths:
-------------
trunk/py/scripts/addons/add_mesh_BoltFactory/original_script_add_mesh_bolt.py
Modified: trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py 2011-10-15 05:53:23 UTC (rev 2446)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/createMesh.py 2011-10-15 06:43:51 UTC (rev 2447)
@@ -17,15 +17,8 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
+import mathutils
-# ???, why do this
-try:
- import mathutils as MATHUTILS
-except:
- import Mathutils as MATHUTILS
-
-
-
from math import *
from itertools import *
@@ -138,11 +131,11 @@
q = radians(angle) #make the rotation go clockwise
if axisFlag == 'x':
- matrix = MATHUTILS.Matrix(((1,0,0,0),(0,cos(q),sin(q),0),(0,-sin(q),cos(q),0),(0,0,0,1)))
+ matrix = mathutils.Matrix(((1,0,0,0),(0,cos(q),sin(q),0),(0,-sin(q),cos(q),0),(0,0,0,1)))
elif axisFlag == 'y':
- matrix = MATHUTILS.Matrix(((cos(q),0,-sin(q),0),(0,1,0,0),(sin(q),0,cos(q),0),(0,0,0,1)))
+ matrix = mathutils.Matrix(((cos(q),0,-sin(q),0),(0,1,0,0),(sin(q),0,cos(q),0),(0,0,0,1)))
elif axisFlag == 'z':
- matrix = MATHUTILS.Matrix(((cos(q),sin(q),0,0),(-sin(q),cos(q),0,0),(0,0,1,0),(0,0,0,1)))
+ matrix = mathutils.Matrix(((cos(q),sin(q),0,0),(-sin(q),cos(q),0,0),(0,0,1,0),(0,0,0,1)))
else:
print ("Simple_RotationMatrix can only do x y z axis")
return matrix
@@ -175,7 +168,7 @@
# Returns a list of verts rotated by the given matrix. Used by SpinDup
def Rot_Mesh(verts, matrix):
- Vector = MATHUTILS.Vector
+ Vector = mathutils.Vector
return [(matrix * Vector(v))[:] for v in verts]
@@ -771,48 +764,48 @@
x = sin(radians(0))*TopBevelRadius
y = cos(radians(0))*TopBevelRadius
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/6))*TopBevelRadius
y = cos(radians(60/6))*TopBevelRadius
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/3))*TopBevelRadius
y = cos(radians(60/3))*TopBevelRadius
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/2))*TopBevelRadius
y = cos(radians(60/2))*TopBevelRadius
- vec4 = MATHUTILS.Vector([x,y,0.0])
+ vec4 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
Row += 1
#Flats
x = tan(radians(0))*Half_Flat
- dvec = vec1 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec1 - mathutils.Vector([x,Half_Flat,0.0])
verts.append([x,Half_Flat,-dvec.length])
x = tan(radians(60/6))*Half_Flat
- dvec = vec2 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec2 - mathutils.Vector([x,Half_Flat,0.0])
verts.append([x,Half_Flat,-dvec.length])
x = tan(radians(60/3))*Half_Flat
- dvec = vec3 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec3 - mathutils.Vector([x,Half_Flat,0.0])
Lowest_Point = -dvec.length
verts.append([x,Half_Flat,-dvec.length])
x = tan(radians(60/2))*Half_Flat
- dvec = vec4 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec4 - mathutils.Vector([x,Half_Flat,0.0])
Lowest_Point = -dvec.length
verts.append([x,Half_Flat,-dvec.length])
Row += 1
@@ -851,88 +844,88 @@
x = sin(radians(0))*Half_Flat
y = cos(radians(0))*Half_Flat
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height])
x = sin(radians(60/6))*Half_Flat
y = cos(radians(60/6))*Half_Flat
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height])
x = sin(radians(60/3))*Half_Flat
y = cos(radians(60/3))*Half_Flat
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height])
x = sin(radians(60/2))*Half_Flat
y = cos(radians(60/2))*Half_Flat
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height])
Row += 1
#under cut down bit
x = sin(radians(0))*Half_Flat
y = cos(radians(0))*Half_Flat
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/6))*Half_Flat
y = cos(radians(60/6))*Half_Flat
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/3))*Half_Flat
y = cos(radians(60/3))*Half_Flat
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/2))*Half_Flat
y = cos(radians(60/2))*Half_Flat
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
Row += 1
#under cut to Shank BEVEAL
x = sin(radians(0))*(SHANK_RADIUS+Shank_Bevel)
y = cos(radians(0))*(SHANK_RADIUS+Shank_Bevel)
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/6))*(SHANK_RADIUS+Shank_Bevel)
y = cos(radians(60/6))*(SHANK_RADIUS+Shank_Bevel)
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/3))*(SHANK_RADIUS+Shank_Bevel)
y = cos(radians(60/3))*(SHANK_RADIUS+Shank_Bevel)
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
x = sin(radians(60/2))*(SHANK_RADIUS+Shank_Bevel)
y = cos(radians(60/2))*(SHANK_RADIUS+Shank_Bevel)
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height])
Row += 1
#under cut to Shank BEVEAL
x = sin(radians(0))*SHANK_RADIUS
y = cos(radians(0))*SHANK_RADIUS
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height-Shank_Bevel])
x = sin(radians(60/6))*SHANK_RADIUS
y = cos(radians(60/6))*SHANK_RADIUS
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height-Shank_Bevel])
x = sin(radians(60/3))*SHANK_RADIUS
y = cos(radians(60/3))*SHANK_RADIUS
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height-Shank_Bevel])
x = sin(radians(60/2))*SHANK_RADIUS
y = cos(radians(60/2))*SHANK_RADIUS
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,-Flat_Height-Undercut_Height-Shank_Bevel])
Row += 1
@@ -1473,50 +1466,50 @@
x = sin(radians(0))*TopBevelRadius
y = cos(radians(0))*TopBevelRadius
- vec1 = MATHUTILS.Vector([x,y,0.0])
+ vec1 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/6))*TopBevelRadius
y = cos(radians(60/6))*TopBevelRadius
- vec2 = MATHUTILS.Vector([x,y,0.0])
+ vec2 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/3))*TopBevelRadius
y = cos(radians(60/3))*TopBevelRadius
- vec3 = MATHUTILS.Vector([x,y,0.0])
+ vec3 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
x = sin(radians(60/2))*TopBevelRadius
y = cos(radians(60/2))*TopBevelRadius
- vec4 = MATHUTILS.Vector([x,y,0.0])
+ vec4 = mathutils.Vector([x,y,0.0])
verts.append([x,y,0.0])
Row += 1
#Flats
x = tan(radians(0))*Half_Flat
- dvec = vec1 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec1 - mathutils.Vector([x,Half_Flat,0.0])
verts.append([x,Half_Flat,-dvec.length])
Lowest_Z_Vert = min(Lowest_Z_Vert,-dvec.length)
x = tan(radians(60/6))*Half_Flat
- dvec = vec2 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec2 - mathutils.Vector([x,Half_Flat,0.0])
verts.append([x,Half_Flat,-dvec.length])
Lowest_Z_Vert = min(Lowest_Z_Vert,-dvec.length)
x = tan(radians(60/3))*Half_Flat
- dvec = vec3 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec3 - mathutils.Vector([x,Half_Flat,0.0])
Lowest_Point = -dvec.length
verts.append([x,Half_Flat,-dvec.length])
Lowest_Z_Vert = min(Lowest_Z_Vert,-dvec.length)
x = tan(radians(60/2))*Half_Flat
- dvec = vec4 - MATHUTILS.Vector([x,Half_Flat,0.0])
+ dvec = vec4 - mathutils.Vector([x,Half_Flat,0.0])
Lowest_Point = -dvec.length
verts.append([x,Half_Flat,-dvec.length])
Lowest_Z_Vert = min(Lowest_Z_Vert,-dvec.length)
Deleted: trunk/py/scripts/addons/add_mesh_BoltFactory/original_script_add_mesh_bolt.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/original_script_add_mesh_bolt.py 2011-10-15 05:53:23 UTC (rev 2446)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/original_script_add_mesh_bolt.py 2011-10-15 06:43:51 UTC (rev 2447)
@@ -1,2611 +0,0 @@
-# ##### 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-bl_info = {
- 'name': 'Add Mesh: Bolt',
- 'author': 'Aaron Keith',
- 'version': '3.00',
- 'blender': (2, 5, 3),
- 'location': 'View3D > Tools ',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list