extensions/add_mesh_BoltFactory
2
2
Fork 5
Code Issues 6 Pull Requests 3 Projects Releases Wiki Activity

Fix for #1: Countersink Head angle vs nominal size #12

Open
sw-tya wants to merge 3 commits from sw-tya/add_mesh_BoltFactory:swtya_CounterSinkHead into main
pull from: sw-tya/add_mesh_BoltFactory:swtya_CounterSinkHead
merge into: extensions:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 3 Files Changed 10 +316 -8
12 changed files with 316 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 434d102ff4 - Show all commits

10
source/Boltfactory.py
View File

@ -26,7 +26,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bl_options = {'REGISTER', 'UNDO', 'PRESET'}
bl_description = "Construct many types of Bolts"
MAX_INPUT_NUMBER = 50 # mm
MAX_INPUT_NUMBER = 250 # mm
Bolt: BoolProperty(name="Bolt",
default=True,
@ -264,16 +264,16 @@ class add_mesh_bolt(Operator, AddObjectHelper):
description='Inside diameter of the Thread',
unit='LENGTH',
)
bf_Crest_Percent: IntProperty(
bf_Crest_Percent: FloatProperty(
attr='bf_Crest_Percent',
name='Crest Percent', default=10,
name='Crest Percent', default=12.5,
min=1, soft_min=1,
max=90,
description='Percent of the pitch that makes up the Crest',
)
bf_Root_Percent: IntProperty(
bf_Root_Percent: FloatProperty(
attr='bf_Root_Percent',
name='Root Percent', default=10,
name='Root Percent', default=25,
min=1, soft_min=1,
max=90,
description='Percent of the pitch that makes up the Root',

12
source/__init__.py
View File

@ -17,10 +17,22 @@ import bpy
def register():
import os
Boltfactory.register()
# Presets
if register_preset_path := getattr(bpy.utils, "register_preset_path", None):
register_preset_path(os.path.join(os.path.dirname(__file__)))
def unregister():
import os
# Presets
if unregister_preset_path := getattr(bpy.utils, "unregister_preset_path", None):
unregister_preset_path(os.path.join(os.path.dirname(__file__)))
Boltfactory.unregister()

2
source/blender_manifest.toml
View File

@ -1,7 +1,7 @@
schema_version = "1.0.0"
id = "boltfactory"
name = "BoltFactory"
version = "0.4.1"
version = "0.4.2"
tagline = "Add a bolt or nut"
maintainer = "Community"
type = "add-on"

4
source/createMesh.py
View File

@ -2402,7 +2402,7 @@ def Bolt_Mesh(props, context):
elif props.bf_Head_Type == 'bf_Head_Cap':
Head_Verts, Head_Faces, Head_Height = Create_Cap_Head(
Bit_Dia, props.bf_Cap_Head_Dia / GLOBAL_SCALE,
props.bf_Shank_Dia, props.bf_Cap_Head_Height / GLOBAL_SCALE,
props.bf_Shank_Dia / GLOBAL_SCALE, props.bf_Cap_Head_Height / GLOBAL_SCALE,
props.bf_Cap_Head_Dia / GLOBAL_SCALE * (1.0 / 19.0),
props.bf_Cap_Head_Dia / GLOBAL_SCALE * (1.0 / 19.0),
props.bf_Div_Count
@ -2424,7 +2424,7 @@ def Bolt_Mesh(props, context):
elif props.bf_Head_Type == 'bf_Head_CounterSink':
Head_Verts, Head_Faces, Head_Height = Create_CounterSink_Head(
Bit_Dia, props.bf_CounterSink_Head_Dia / GLOBAL_SCALE,
props.bf_Shank_Dia, props.bf_CounterSink_Head_Dia / GLOBAL_SCALE,
props.bf_Shank_Dia / GLOBAL_SCALE, props.bf_CounterSink_Head_Dia / GLOBAL_SCALE,
props.bf_CounterSink_Head_Dia / GLOBAL_SCALE * (0.09 / 6.31),
props.bf_Div_Count
)

37
source/presets/operator/mesh.bolt_add/_default.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 3.0 / 1000.0
op.bf_Phillips_Bit_Depth = 1.1431535482406616 / 1000.0
op.bf_Allen_Bit_Depth = 1.5 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 2.5 / 1000.0
op.bf_Torx_Bit_Depth = 1.5 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T10'
op.bf_Hex_Head_Height = 2.0 / 1000.0
op.bf_Hex_Head_Flat_Distance = 5.5 / 1000.0
op.bf_12_Point_Head_Height = 3.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 3.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 5.72 / 1000.0
op.bf_CounterSink_Head_Dia = 6.300000190734863 / 1000.0
op.bf_Cap_Head_Height = 3.0 / 1000.0
op.bf_Cap_Head_Dia = 5.5 / 1000.0
op.bf_Dome_Head_Dia = 5.599999904632568 / 1000.0
op.bf_Pan_Head_Dia = 5.599999904632568 / 1000.0
op.bf_Philips_Bit_Dia = 1.8199999332427979 / 1000.0
op.bf_Thread_Length = 6.0 / 1000.0
op.bf_Major_Dia = 3.0 / 1000.0
op.bf_Pitch = 0.3499999940395355 / 1000.0
op.bf_Minor_Dia = 2.6211137771606445 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 2.4000000953674316 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 5.5 / 1000.0
op.bf_12_Point_Nut_Height = 3.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 3.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 5.72 / 1000.0

37
source/presets/operator/mesh.bolt_add/_m3.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 3.0 / 1000.0
op.bf_Phillips_Bit_Depth = 1.1431535482406616 / 1000.0
op.bf_Allen_Bit_Depth = 1.5 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 2.5 / 1000.0
op.bf_Torx_Bit_Depth = 1.5 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T10'
op.bf_Hex_Head_Height = 2.0 / 1000.0
op.bf_Hex_Head_Flat_Distance = 5.5 / 1000.0
op.bf_12_Point_Head_Height = 3.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 3.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 5.72 / 1000.0
op.bf_CounterSink_Head_Dia = 6.300000190734863 / 1000.0
op.bf_Cap_Head_Height = 3.0 / 1000.0
op.bf_Cap_Head_Dia = 5.5 / 1000.0
op.bf_Dome_Head_Dia = 5.599999904632568 / 1000.0
op.bf_Pan_Head_Dia = 5.599999904632568 / 1000.0
op.bf_Philips_Bit_Dia = 1.8199999332427979 / 1000.0
op.bf_Thread_Length = 6.0 / 1000.0
op.bf_Major_Dia = 3.0 / 1000.0
op.bf_Pitch = 0.3499999940395355 / 1000.0
op.bf_Minor_Dia = 2.6211137771606445 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 2.4000000953674316 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 5.5 / 1000.0
op.bf_12_Point_Nut_Height = 3.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 3.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 5.72 / 1000.0

37
source/presets/operator/mesh.bolt_add/_m4.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 4.0 / 1000.0
op.bf_Phillips_Bit_Depth = 1.6330764293670654 / 1000.0
op.bf_Allen_Bit_Depth = 2.0 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 3.0 / 1000.0
op.bf_Torx_Bit_Depth = 2.0 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T20'
op.bf_Hex_Head_Height = 2.799999952316284 / 1000.0
op.bf_Hex_Head_Flat_Distance = 7.0 / 1000.0
op.bf_12_Point_Head_Height = 4.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 4.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 7.22 / 1000.0
op.bf_CounterSink_Head_Dia = 9.399999618530273 / 1000.0
op.bf_Cap_Head_Height = 4.0 / 1000.0
op.bf_Cap_Head_Dia = 7.0 / 1000.0
op.bf_Dome_Head_Dia = 8.0 / 1000.0
op.bf_Pan_Head_Dia = 8.0 / 1000.0
op.bf_Philips_Bit_Dia = 2.5999999046325684 / 1000.0
op.bf_Thread_Length = 8.0 / 1000.0
op.bf_Major_Dia = 4.0 / 1000.0
op.bf_Pitch = 0.5 / 1000.0
op.bf_Minor_Dia = 3.4587340354919434 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 3.200000047683716 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 7.0 / 1000.0
op.bf_12_Point_Nut_Height = 4.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 4.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 7.22 / 1000.0

37
source/presets/operator/mesh.bolt_add/_m5.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 5.0 / 1000.0
op.bf_Phillips_Bit_Depth = 1.9392783641815186 / 1000.0
op.bf_Allen_Bit_Depth = 2.5 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 4.0 / 1000.0
op.bf_Torx_Bit_Depth = 2.5 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T25'
op.bf_Hex_Head_Height = 3.5 / 1000.0
op.bf_Hex_Head_Flat_Distance = 8.0 / 1000.0
op.bf_12_Point_Head_Height = 5.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 5.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 8.72 / 1000.0
op.bf_CounterSink_Head_Dia = 10.399999618530273 / 1000.0
op.bf_Cap_Head_Height = 5.0 / 1000.0
op.bf_Cap_Head_Dia = 8.5 / 1000.0
op.bf_Dome_Head_Dia = 9.5 / 1000.0
op.bf_Pan_Head_Dia = 9.5 / 1000.0
op.bf_Philips_Bit_Dia = 3.0875000953674316 / 1000.0
op.bf_Thread_Length = 10.0 / 1000.0
op.bf_Major_Dia = 5.0 / 1000.0
op.bf_Pitch = 0.5 / 1000.0
op.bf_Minor_Dia = 4.458734035491943 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 4.0 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 8.0 / 1000.0
op.bf_12_Point_Nut_Height = 5.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 5.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 8.72 / 1000.0

37
source/presets/operator/mesh.bolt_add/_m6.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 6.0 / 1000.0
op.bf_Phillips_Bit_Depth = 2.4496147632598877 / 1000.0
op.bf_Allen_Bit_Depth = 3.0 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 5.0 / 1000.0
op.bf_Torx_Bit_Depth = 3.0 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T30'
op.bf_Hex_Head_Height = 4.0 / 1000.0
op.bf_Hex_Head_Flat_Distance = 10.0 / 1000.0
op.bf_12_Point_Head_Height = 6.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 6.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 10.22 / 1000.0
op.bf_CounterSink_Head_Dia = 12.600000381469727 / 1000.0
op.bf_Cap_Head_Height = 6.0 / 1000.0
op.bf_Cap_Head_Dia = 10.0 / 1000.0
op.bf_Dome_Head_Dia = 12.0 / 1000.0
op.bf_Pan_Head_Dia = 12.0 / 1000.0
op.bf_Philips_Bit_Dia = 3.9000000953674316 / 1000.0
op.bf_Thread_Length = 12.0 / 1000.0
op.bf_Major_Dia = 6.0 / 1000.0
op.bf_Pitch = 0.75 / 1000.0
op.bf_Minor_Dia = 5.188100814819336 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 5.0 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 10.0 / 1000.0
op.bf_12_Point_Nut_Height = 6.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 6.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 10.22 / 1000.0

37
source/presets/operator/mesh.bolt_add/_m8.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 8.0 / 1000.0
op.bf_Phillips_Bit_Depth = 3.266152858734131 / 1000.0
op.bf_Allen_Bit_Depth = 4.0 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 6.0 / 1000.0
op.bf_Torx_Bit_Depth = 4.0 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T40'
op.bf_Hex_Head_Height = 5.300000190734863 / 1000.0
op.bf_Hex_Head_Flat_Distance = 13.0 / 1000.0
op.bf_12_Point_Head_Height = 8.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 8.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 13.27 / 1000.0
op.bf_CounterSink_Head_Dia = 17.299999237060547 / 1000.0
op.bf_Cap_Head_Height = 8.0 / 1000.0
op.bf_Cap_Head_Dia = 13.5 / 1000.0
op.bf_Dome_Head_Dia = 16.0 / 1000.0
op.bf_Pan_Head_Dia = 16.0 / 1000.0
op.bf_Philips_Bit_Dia = 5.199999809265137 / 1000.0
op.bf_Thread_Length = 16.0 / 1000.0
op.bf_Major_Dia = 8.0 / 1000.0
op.bf_Pitch = 1.0 / 1000.0
op.bf_Minor_Dia = 6.917468070983887 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 6.5 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 13.0 / 1000.0
op.bf_12_Point_Nut_Height = 8.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 8.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 13.27 / 1000.0

37
source/presets/operator/mesh.bolt_add/m10.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0 / 1000.0
op.bf_Shank_Dia = 10.0 / 1000.0
op.bf_Phillips_Bit_Depth = 4.082691192626953 / 1000.0
op.bf_Allen_Bit_Depth = 5.0 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 8.0 / 1000.0
op.bf_Torx_Bit_Depth = 5.0 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T50'
op.bf_Hex_Head_Height = 6.400000095367432 / 1000.0
op.bf_Hex_Head_Flat_Distance = 17.0 / 1000.0
op.bf_12_Point_Head_Height = 10.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 10.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 16.27 / 1000.0
op.bf_CounterSink_Head_Dia = 20.0 / 1000.0
op.bf_Cap_Head_Height = 10.0 / 1000.0
op.bf_Cap_Head_Dia = 16.0 / 1000.0
op.bf_Dome_Head_Dia = 20.0 / 1000.0
op.bf_Pan_Head_Dia = 20.0 / 1000.0
op.bf_Philips_Bit_Dia = 6.5 / 1000.0
op.bf_Thread_Length = 20.0 / 1000.0
op.bf_Major_Dia = 10.0 / 1000.0
op.bf_Pitch = 1.25 / 1000.0
op.bf_Minor_Dia = 8.646835327148438 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 8.0 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 17.0 / 1000.0
op.bf_12_Point_Nut_Height = 10.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 10.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 16.27 / 1000.0

37
source/presets/operator/mesh.bolt_add/m12.py Normal file
View File

@ -0,0 +1,37 @@
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 33.0 / 1000.0
op.bf_Shank_Dia = 12.0 / 1000.0
op.bf_Phillips_Bit_Depth = 4.899229526519775 / 1000.0
op.bf_Allen_Bit_Depth = 6.0 / 1000.0
op.bf_Allen_Bit_Flat_Distance = 10.0 / 1000.0
op.bf_Torx_Bit_Depth = 6.0 / 1000.0
op.bf_Torx_Size_Type = 'bf_Torx_T55'
op.bf_Hex_Head_Height = 7.5 / 1000.0
op.bf_Hex_Head_Flat_Distance = 19.0 / 1000.0
op.bf_12_Point_Head_Height = 12.0 / 1000.0
op.bf_12_Point_Head_Flat_Distance = 12.0 / 1000.0
op.bf_12_Point_Head_Flange_Dia = 18.27 / 1000.0
op.bf_CounterSink_Head_Dia = 22.0 / 1000.0
op.bf_Cap_Head_Height = 12.0 / 1000.0
op.bf_Cap_Head_Dia = 18.5 / 1000.0
op.bf_Dome_Head_Dia = 24.0 / 1000.0
op.bf_Pan_Head_Dia = 24.0 / 1000.0
op.bf_Philips_Bit_Dia = 7.800000190734863 / 1000.0
op.bf_Thread_Length = 32.0 / 1000.0
op.bf_Major_Dia = 12.0 / 1000.0
op.bf_Pitch = 1.5 / 1000.0
op.bf_Minor_Dia = 10.376201629638672 / 1000.0
op.bf_Crest_Percent = 12.5
op.bf_Root_Percent = 25
op.bf_Div_Count = 36
op.bf_Hex_Nut_Height = 10.0 / 1000.0
op.bf_Hex_Nut_Flat_Distance = 19.0 / 1000.0
op.bf_12_Point_Nut_Height = 12.0 / 1000.0
op.bf_12_Point_Nut_Flat_Distance = 12.0 / 1000.0
op.bf_12_Point_Nut_Flange_Dia = 18.27 / 1000.0