[Bf-extensions-cvs] [a1504c8] master: Fix T51338: Add an offset to the internal thread, validate
lijenstina
noreply at git.blender.org
Sat Apr 29 07:26:18 CEST 2017
Commit: a1504c8cb2b49bcb715723d240876bee6a1730dd
Author: lijenstina
Date: Sat Apr 29 07:25:09 2017 +0200
Branches: master
https://developer.blender.org/rBAa1504c8cb2b49bcb715723d240876bee6a1730dd
Fix T51338: Add an offset to the internal thread, validate
Bumped version to 0.3.3
The crash was in Create_Internal_Thread_End_Verts
Possibly creating vert coord with the same values
added a small random offset to the x and y in the case
j == 0
Added a mesh.validate with a print function in case of
failures as I'm not sure that the generator will produce
valid results all the time
The print function will tell that something is wrong though
Removed a reduntant for loop - in range(1)
Small cleanup
===================================================================
M add_mesh_BoltFactory/Boltfactory.py
M add_mesh_BoltFactory/__init__.py
M add_mesh_BoltFactory/createMesh.py
===================================================================
diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py
index 89af117..67e46d8 100644
--- a/add_mesh_BoltFactory/Boltfactory.py
+++ b/add_mesh_BoltFactory/Boltfactory.py
@@ -19,6 +19,7 @@
import bpy
from mathutils import Matrix
+from bpy.types import Operator
from bpy.props import (
BoolProperty,
EnumProperty,
@@ -41,7 +42,7 @@ def align_matrix(context):
return align_matrix
-class add_mesh_bolt(bpy.types.Operator):
+class add_mesh_bolt(Operator):
bl_idname = "mesh.bolt_add"
bl_label = "Add Bolt"
bl_options = {'REGISTER', 'UNDO', 'PRESET'}
@@ -314,12 +315,10 @@ class add_mesh_bolt(bpy.types.Operator):
return context.scene is not None
def execute(self, context):
- # print('EXECUTING...')
createMesh.Create_New_Mesh(self, context, self.align_matrix)
return {'FINISHED'}
def invoke(self, context, event):
- # print('\n___________START_____________')
# store creation_matrix
self.align_matrix = align_matrix(context)
self.execute(context)
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 8c94ec3..d4ad13c 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -19,7 +19,7 @@
bl_info = {
"name": "BoltFactory",
"author": "Aaron Keith",
- "version": (0, 3, 2),
+ "version": (0, 3, 3),
"blender": (2, 78, 0),
"location": "View3D > Add > Mesh",
"description": "Add a bolt or nut",
diff --git a/add_mesh_BoltFactory/createMesh.py b/add_mesh_BoltFactory/createMesh.py
index fcdefdc..a211be2 100644
--- a/add_mesh_BoltFactory/createMesh.py
+++ b/add_mesh_BoltFactory/createMesh.py
@@ -22,11 +22,10 @@ from mathutils import (
Vector,
)
from math import (
- sin,
- cos,
- tan,
- radians,
+ sin, cos,
+ tan, radians,
)
+from random import triangular
NARROW_UI = 180
MAX_INPUT_NUMBER = 50
@@ -546,7 +545,6 @@ def Create_Dome_Head(HOLE_DIA, HEAD_DIA, SHANK_DIA, HEIGHT, RAD1, RAD2, FACE_OFF
verts = []
faces = []
Row = 0
- # BEVEL = HEIGHT * 0.01 # UNUSED
# Dome_Rad = HEAD_RADIUS * (1.0/1.75)
Dome_Rad = HEAD_RADIUS * 1.12
@@ -610,7 +608,6 @@ def Create_CounterSink_Head(HOLE_DIA, HEAD_DIA, SHANK_DIA, HEIGHT, RAD1, DIV_COU
# HEAD_RADIUS = (HEIGHT/tan(radians(60))) + SHANK_RADIUS
HEIGHT = tan(radians(60)) * (HEAD_RADIUS - SHANK_RADIUS)
- # print(RAD1)
FaceStart = len(verts)
@@ -874,7 +871,6 @@ def Create_Hex_Head(FLAT, HOLE_DIA, SHANK_DIA, HEIGHT):
verts.append([x, y, -Flat_Height - Undercut_Height - Shank_Bevel])
Row += 1
- # Global_Head_Height = 0 - (-HEIGHT-0.1)
faces.extend(Build_Face_List_Quads(FaceStart, 3, Row - 1))
Mirror_Verts, Mirror_Faces = Mirror_Verts_Faces(verts, faces, 'y')
@@ -896,14 +892,14 @@ def Thread_Start3(verts, INNER_RADIUS, OUTTER_RADIUS, PITCH, DIV_COUNT,
Ret_Row = 0
- # Half_Pitch = float(PITCH)/2 # UNUSED
Height_Start = Height_Offset - PITCH
Height_Step = float(PITCH) / float(DIV_COUNT)
Deg_Step = 360.0 / float(DIV_COUNT)
Crest_Height = float(PITCH) * float(CREST_PERCENT) / float(100)
Root_Height = float(PITCH) * float(ROOT_PERCENT) / float(100)
- Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
+ Root_to_Crest_Height = Crest_to_Root_Height = \
+ (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
# thread start
Rank = float(OUTTER_RADIUS - INNER_RADIUS) / float(DIV_COUNT)
@@ -1015,7 +1011,6 @@ def Create_Thread_Start_Verts(INNER_DIA, OUTTER_DIA, PITCH, CREST_PERCENT,
INNER_RADIUS = INNER_DIA / 2
OUTTER_RADIUS = OUTTER_DIA / 2
- # Half_Pitch = float(PITCH)/2 # UNUSED
Deg_Step = 360.0 / float(DIV_COUNT)
Height_Step = float(PITCH) / float(DIV_COUNT)
@@ -1029,7 +1024,8 @@ def Create_Thread_Start_Verts(INNER_DIA, OUTTER_DIA, PITCH, CREST_PERCENT,
Crest_Height = float(PITCH) * float(CREST_PERCENT) / float(100)
Root_Height = float(PITCH) * float(ROOT_PERCENT) / float(100)
- Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
+ Root_to_Crest_Height = Crest_to_Root_Height = \
+ (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
Rank = float(OUTTER_RADIUS - INNER_RADIUS) / float(DIV_COUNT)
@@ -1148,7 +1144,6 @@ def Create_Thread_Verts(INNER_DIA, OUTTER_DIA, PITCH, HEIGHT,
INNER_RADIUS = INNER_DIA / 2
OUTTER_RADIUS = OUTTER_DIA / 2
- # Half_Pitch = float(PITCH)/2 # UNUSED
Deg_Step = 360.0 / float(DIV_COUNT)
Height_Step = float(PITCH) / float(DIV_COUNT)
@@ -1159,7 +1154,8 @@ def Create_Thread_Verts(INNER_DIA, OUTTER_DIA, PITCH, HEIGHT,
Crest_Height = float(PITCH) * float(CREST_PERCENT) / float(100)
Root_Height = float(PITCH) * float(ROOT_PERCENT) / float(100)
- Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
+ Root_to_Crest_Height = Crest_to_Root_Height = \
+ (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
Height_Offset = Z_LOCATION
@@ -1213,26 +1209,21 @@ def Create_Thread_End_Verts(INNER_DIA, OUTTER_DIA, PITCH, CREST_PERCENT,
INNER_RADIUS = INNER_DIA / 2
OUTTER_RADIUS = OUTTER_DIA / 2
- # Half_Pitch = float(PITCH)/2 # UNUSED
Deg_Step = 360.0 / float(DIV_COUNT)
Height_Step = float(PITCH) / float(DIV_COUNT)
Crest_Height = float(PITCH) * float(CREST_PERCENT) / float(100)
Root_Height = float(PITCH) * float(ROOT_PERCENT) / float(100)
- Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
+ Root_to_Crest_Height = Crest_to_Root_Height = \
+ (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
- # Col = 0 # UNUSED
Row = 0
Height_Offset = Z_LOCATION
-
Tapper_Height_Start = Height_Offset - PITCH - PITCH
-
Max_Height = Tapper_Height_Start - PITCH
-
Lowest_Z_Vert = 0
- # FaceStart = len(verts) # UNUSED
for j in range(4):
for i in range(DIV_COUNT + 1):
@@ -1538,14 +1529,12 @@ def add_Nylon_Part(OUTSIDE_RADIUS, Z_LOCATION, DIV_COUNT):
INNER_HOLE = OUTSIDE_RADIUS - (OUTSIDE_RADIUS * (1.5 / 4.75))
EDGE_THICKNESS = (OUTSIDE_RADIUS * (0.4 / 4.75))
- # RAD1 = (OUTSIDE_RADIUS * (0.5/4.75)) # UNUSED
OVER_ALL_HEIGTH = (OUTSIDE_RADIUS * (2.0 / 4.75))
PART_THICKNESS = OVER_ALL_HEIGTH - EDGE_THICKNESS
PART_INNER_HOLE = (OUTSIDE_RADIUS * (2.5 / 4.75))
FaceStart = len(verts)
- # Start_Height = 0 - 3 # UNUSED
Height_Offset = Z_LOCATION
Lowest_Z_Vert = 0
@@ -1593,104 +1582,103 @@ def Create_Internal_Thread_Start_Verts(verts, INNER_RADIUS, OUTTER_RADIUS, PITCH
# at the correct place (Height_Start)
Height_Offset = Height_Offset + PITCH
- # Half_Pitch = float(PITCH)/2 # UNUSED
Height_Start = Height_Offset - PITCH
Height_Step = float(PITCH) / float(DIV)
Deg_Step = 360.0 / float(DIV)
Crest_Height = float(PITCH) * float(CREST_PERCENT) / float(100)
Root_Height = float(PITCH) * float(ROOT_PERCENT) / float(100)
- Root_to_Crest_Height = Crest_to_Root_Height = (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
+ Root_to_Crest_Height = Crest_to_Root_Height = \
+ (float(PITCH) - (Crest_Height + Root_Height)) / 2.0
Rank = float(OUTTER_RADIUS - INNER_RADIUS) / float(DIV)
- for j in range(1): # FIXME - for j in range(1) what?!
- for i in range(DIV + 1):
- z = Height_Offset - (Height_Step * i)
- if z > Height_Start:
- z = Height_Start
- x = sin(radians(i * Deg_Step)) * OUTTER_RADIUS
- y = cos(radians(i * Deg_Step)) * OUTTER_RADIUS
- verts.append([x, y, z])
- Height_Offset -= Crest_Height
- Ret_Row += 1
+ for i in range(DIV + 1):
+ z = Height_Offset - (Height_Step * i)
+ if z > Height_Start:
+ z = Height_Start
+ x = sin(radians(i * Deg_Step)) * OUTTER_RADIUS
+ y = cos(radians(i * Deg_Step)) * OUTTER_RADIUS
- for i in range(DIV + 1):
- z = Height_Offset - (Height_Step * i)
- if z > Height_Start:
- z = Height_Start
+ verts.append([x, y, z])
+ Height_Offset -= Crest_Height
+ Ret_Row += 1
- x = sin(radians(i * Deg_Step)) * OUTTER_RADIUS
- y = cos(radians(i * Deg_Step)) * OUTTER_RADIUS
- verts.append([x, y, z])
- Height_Offset -= Crest_to_Root_Height
- Ret_Row += 1
+ for i in range(DIV + 1):
+ z = Height_Offset - (Height_Step * i)
+ if z > Height_Start:
+ z = Height_Start
- for i in range(DIV + 1):
- z = Height_Offset - (Height_Step * i)
- if z > Height_Start:
- z = Height_Start
+ x = sin(radians(i * Deg_Step)) * OUTTER_RADIUS
+ y = cos(radians(i * Deg_Step)) * OUTTER_RADIUS
- x = sin(radians(i * Deg_Step)) * INNER_RADIUS
- y = cos(radians(i * Deg_Step)) * INNER_RADIUS
- if j == 0:
- x = sin(radians(i * Deg_Step)) * (OUTTER_RADIUS - (i * Rank))
- y = cos(radians(i * Deg_Step)) * (OUTTER_RADIUS - (i * Rank))
- verts.append([x, y, z])
- Height_Offset -= Root_Height
- Ret_Row += 1
+ verts.append([x, y, z])
+ Height_Offset -= Crest_to_Root_Height
+ Ret_Row += 1
- for i in range(DIV + 1):
- z = Height_Offset - (Height_Step * i)
- if z > Height_Start:
- z = Height_Start
+ for i in range(DIV + 1):
+ z = Height_Offset - (Height_Step * i)
+ if z > Height_Start:
+ z = Height_Start
- x = sin(radians(i * Deg_Step)) * INNER_RADIUS
- y = cos(radians(i * Deg_Step)) * INNER_RADIUS
+ x = sin(radians(i * Deg_Step)) * INNER_RADIUS
+ y = cos(radians(i * Deg_Step)) * INNER_RADIUS
- if j == 0:
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list