mirror
/
blendercam
kopia lustrzana https://github.com/vilemduha/blendercam
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

disabled 4 axis development for now.. don't have time to finish things and have other targets, also, I don't have a machine on which I could possibly test stuff

pull/4/head
vilda.novak@gmail.com 2013-10-14 21:31:45 +00:00
rodzic 66c4d4b763
commit 29b475fb4b
2 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
scripts/addons/cam/__init__.py
Wyświetl plik

@ -1076,7 +1076,7 @@ class CAM_MACHINE_Panel(bpy.types.Panel):
layout.prop(ao,'spindle_min') layout.prop(ao,'spindle_min')
layout.prop(ao,'spindle_max') layout.prop(ao,'spindle_max')
#layout.prop(ao,'spindle_default') #layout.prop(ao,'spindle_default')
layout.prop(ao,'axis4') #layout.prop(ao,'axis4')
#layout.prop(ao,'axis5') #layout.prop(ao,'axis5')
#layout.prop(ao,'collet_size') #layout.prop(ao,'collet_size')
@ -1316,7 +1316,7 @@ class CAM_OPERATION_PROPERTIES_Panel(bpy.types.Panel):
if len(scene.cam_operations)>0: if len(scene.cam_operations)>0:
ao=scene.cam_operations[scene.cam_active_operation] ao=scene.cam_operations[scene.cam_active_operation]
if ao.valid: if ao.valid:
layout.prop(ao,'axes') #layout.prop(ao,'axes')
if ao.axes=='3': if ao.axes=='3':
layout.prop(ao,'strategy') layout.prop(ao,'strategy')
elif ao.axes=='4': elif ao.axes=='4':

14
scripts/addons/cam/utils.py
Wyświetl plik

@ -2733,7 +2733,7 @@ def chunksToMesh(chunks,o):
#lift and drop #lift and drop
if lifted: if lifted:
if o.axes=='3': if o.axes=='3' or o.axes=='5':
v=(ch.points[0][0],ch.points[0][1],o.free_movement_height) v=(ch.points[0][0],ch.points[0][1],o.free_movement_height)
else: else:
v=ch.startpoints[0]#startpoints=retract points v=ch.startpoints[0]#startpoints=retract points
@ -2741,7 +2741,7 @@ def chunksToMesh(chunks,o):
verts.append(v) verts.append(v)
verts.extend(ch.points) verts.extend(ch.points)
if o.axes!='3': if o.axes!='3' and o.axes!='5':
verts_rotations.extend(ch.rotations) verts_rotations.extend(ch.rotations)
lift = True lift = True
@ -2756,7 +2756,7 @@ def chunksToMesh(chunks,o):
lift=False lift=False
if lift: if lift:
if o.axes== '3': if o.axes== '3' or o.axes=='5':
v=(ch.points[-1][0],ch.points[-1][1],o.free_movement_height) v=(ch.points[-1][0],ch.points[-1][1],o.free_movement_height)
else: else:
v=ch.startpoints[-1] v=ch.startpoints[-1]
@ -5177,10 +5177,10 @@ def prepare5axisIndexed(o):
oriname=o.name+' orientation' oriname=o.name+' orientation'
ori=s.objects[oriname] ori=s.objects[oriname]
rot=ori.rotation_euler.copy() rot=ori.matrix_world.inverted()
rot.x=-rot.x #rot.x=-rot.x
rot.y=-rot.y #rot.y=-rot.y
rot.z=-rot.z #rot.z=-rot.z
rotationaxes = rotTo2axes(ori.rotation_euler,'CA') rotationaxes = rotTo2axes(ori.rotation_euler,'CA')
#bpy.context.space_data.pivot_point = 'CURSOR' #bpy.context.space_data.pivot_point = 'CURSOR'