kopia lustrzana https://github.com/vilemduha/blendercam
-bug in update function again.
-removed some debugging comments -fixed a bug with alignment - all cutouts and silhouettes were offest by amout of 2 pixels! This was introduced with another fixpull/4/head
rodzic
b357861129
commit
d2b1721d06
Plik binarny nie jest wyświetlany.
|
|
@ -165,12 +165,12 @@ def checkMemoryLimit(o):
|
|||
resy=sy/o.pixsize
|
||||
res=resx*resy
|
||||
limit=o.imgres_limit*1000000
|
||||
print('co se to deje')
|
||||
#print('co se to deje')
|
||||
#if res>limit:
|
||||
# ratio=(res/limit)
|
||||
# o.pixsize=o.pixsize*math.sqrt(ratio)
|
||||
# o.warnings=o.warnings+'sampling resolution had to be reduced!\n'
|
||||
print('furt nevim')
|
||||
#print('furt nevim')
|
||||
#print(ratio)
|
||||
|
||||
|
||||
|
|
@ -196,8 +196,8 @@ def updateStrategy(o,context):
|
|||
|
||||
def updateExact(o,context):
|
||||
o.changed=True
|
||||
self.update_zbufferimage_tag=True
|
||||
self.update_offsetimage_tag=True
|
||||
o.update_zbufferimage_tag=True
|
||||
o.update_offsetimage_tag=True
|
||||
if o.use_exact and (o.strategy=='WATERLINE' or o.strategy=='POCKET' or o.inverse):
|
||||
o.use_exact=False
|
||||
|
||||
|
|
@ -568,7 +568,7 @@ class CalculatePath(bpy.types.Operator):
|
|||
if o.computing:
|
||||
return {'FINISHED'}
|
||||
|
||||
print('ahoj0')
|
||||
#print('ahoj0')
|
||||
#these tags are for caching of some of the results.
|
||||
chd=getChangeData(o)
|
||||
#print(chd)
|
||||
|
|
@ -585,7 +585,7 @@ class CalculatePath(bpy.types.Operator):
|
|||
o.operator=self
|
||||
#'''#removed for groups support, this has to be done object by object...
|
||||
getOperationSources(o)
|
||||
print('áhoj1')
|
||||
#print('áhoj1')
|
||||
if o.geometry_source=='OBJECT' or o.geometry_source=='GROUP':
|
||||
o.onlycurves=True
|
||||
for ob in o.objects:
|
||||
|
|
@ -593,7 +593,7 @@ class CalculatePath(bpy.types.Operator):
|
|||
o.onlycurves=False;
|
||||
o.warnings=''
|
||||
checkMemoryLimit(o)
|
||||
print('áhoj2')
|
||||
#print('áhoj2')
|
||||
utils.getPath(context,o)
|
||||
o.changed=False
|
||||
return {'FINISHED'}
|
||||
|
|
|
|||
|
|
@ -833,7 +833,7 @@ def imageToChunks(o,image):
|
|||
vecchunk=[]
|
||||
vecchunks.append(vecchunk)
|
||||
for i in range(0,len(ch)):
|
||||
ch[i]=((ch[i][0]+coef-o.borderwidth+borderspread)*pixsize+minx,(ch[i][1]+coef-o.borderwidth+borderspread)*pixsize+miny,0)
|
||||
ch[i]=((ch[i][0]+coef-o.borderwidth)*pixsize+minx,(ch[i][1]+coef-o.borderwidth)*pixsize+miny,0)
|
||||
vecchunk.append(Vector(ch[i]))
|
||||
t=time.time()
|
||||
#print('optimizing outline')
|
||||
|
|
|
|||
|
|
@ -145,4 +145,5 @@ def packCurves():
|
|||
x+=shift
|
||||
if rotate: rot+=rotchange
|
||||
iter+=1
|
||||
i+=1
|
||||
i+=1
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ def getBoundsWorldspace(obs):
|
|||
return minx,miny,minz,maxx,maxy,maxz
|
||||
|
||||
def getBounds(o):
|
||||
print('kolikrat sem rpijde')
|
||||
#print('kolikrat sem rpijde')
|
||||
if o.geometry_source=='OBJECT' or o.geometry_source=='GROUP':
|
||||
if o.material_from_model:
|
||||
minx,miny,minz,maxx,maxy,maxz=getBoundsWorldspace(o.objects)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue