diff --git a/Examples/intarsion_example.blend b/Examples/intarsion_example.blend index c1f0dc5..3cb0c5e 100644 Binary files a/Examples/intarsion_example.blend and b/Examples/intarsion_example.blend differ diff --git a/scripts/addons/cam/__init__.py b/scripts/addons/cam/__init__.py index 05dd997..89901bf 100644 --- a/scripts/addons/cam/__init__.py +++ b/scripts/addons/cam/__init__.py @@ -1218,6 +1218,7 @@ def get_panels(): # convenience function for bot register and unregister functi curvecamtools.CamCurveHatch, curvecamtools.CamCurvePlate, curvecamtools.CamCurveDrawer, + curvecamtools.CamCurveMortise, curvecamtools.CamOffsetSilhouete, curvecamtools.CamObjectSilhouete, curvecamtools.CamCurveIntarsion, @@ -1420,6 +1421,7 @@ classes = [ curvecamtools.CamCurveHatch, curvecamtools.CamCurvePlate, curvecamtools.CamCurveDrawer, + curvecamtools.CamCurveMortise, curvecamtools.CamOffsetSilhouete, curvecamtools.CamObjectSilhouete, curvecamtools.CamCurveIntarsion, diff --git a/scripts/addons/cam/joinery.py b/scripts/addons/cam/joinery.py index 132ceda..c81216d 100644 --- a/scripts/addons/cam/joinery.py +++ b/scripts/addons/cam/joinery.py @@ -45,7 +45,7 @@ def finger_amount(space, size): return finger_amt -def mortice(length, thickness, finger_play, cx=0, cy=0, rotation=0): +def mortise(length, thickness, finger_play, cx=0, cy=0, rotation=0): bpy.ops.curve.simple(align='WORLD', location=(cx, cy, 0), rotation=(0, 0, rotation), Simple_Type='Rectangle', @@ -60,9 +60,9 @@ def horizontal_finger(length, thickness, finger_play, amount): # _wfa is centered at 0,0 # _wfb is _wfa offset by one length # takes in the - # length = length of the mortice + # length = length of the mortise # thickness = thickness of the material - # fingerplay = tolerence in length of the finger for smooth fit + # fingerplay = tolerance in length of the finger for smooth fit for i in range(amount): if i == 0: @@ -87,9 +87,9 @@ def vertical_finger(length, thickness, finger_play, amount): # _vfa is starts at 0,0 # _wfb is _wfa offset vertically by one length # takes in the - # length = length of the mortice + # length = length of the mortise # thickness = thickness of the material - # fingerplay = tolerence in length of the finger for smooth fit + # fingerplay = tolerance in length of the finger for smooth fit # amount = amount of fingers for i in range(amount): @@ -144,3 +144,5 @@ def create_base_plate(height, width, depth): use_cyclic_u=True, handleType='AUTO', edit_mode=False) bpy.context.active_object.name = "_bottom" + + diff --git a/scripts/addons/cam/ui.py b/scripts/addons/cam/ui.py index 4cf5909..d23c208 100644 --- a/scripts/addons/cam/ui.py +++ b/scripts/addons/cam/ui.py @@ -988,6 +988,7 @@ class VIEW3D_PT_tools_curvetools(bpy.types.Panel): layout.operator("object.curve_hatch") layout.operator("object.curve_plate") layout.operator("object.curve_drawer") + layout.operator("object.curve_mortise") layout.operator("object.curve_intarsion") layout.operator("object.curve_overcuts") layout.operator("object.curve_overcuts_b")