Fixes for name errors in conversion functions

This commit is contained in:
Steven Robertson 2012-04-16 01:32:14 -07:00
parent f156b18ce7
commit 5cbbf67886
2 changed files with 5 additions and 7 deletions

View File

@ -88,18 +88,18 @@ def convert_xform(xf):
def make_symm_xforms(kind, offset): def make_symm_xforms(kind, offset):
assert kind != 0, 'Pick your own damn symmetry.' assert kind != 0, 'Pick your own damn symmetry.'
out = [] out = []
boring_xf = dict(color=1, color_speed=0, density=1, boring_xf = dict(color=1, color_speed=0, weight=1,
variations={'linear': {'weight': 1}}) variations={'linear': {'weight': 1}})
if kind < 0: if kind < 0:
out.append(boring_xf.copy()) out.append(boring_xf.copy())
out[-1]['affine'] = dict(angle=135, spread=-45) out[-1]['pre_affine'] = dict(angle=135, spread=-45)
kind = -kind kind = -kind
for i in range(1, kind): for i in range(1, kind):
out.append(boring_xf.copy()) out.append(boring_xf.copy())
if kind >= 3: if kind >= 3:
out[-1]['color'] = (i - 1) / (kind - 2.0) out[-1]['color'] = (i - 1) / (kind - 2.0)
ang = (45 + 360 * i / float(kind)) % 360 ang = (45 + 360 * i / float(kind)) % 360
out[-1]['affine'] = dict(angle=ang, spread=-45) out[-1]['pre_affine'] = dict(angle=ang, spread=-45)
return dict(enumerate(out, offset)) return dict(enumerate(out, offset))
def convert_xforms(flame): def convert_xforms(flame):

View File

@ -29,7 +29,7 @@ profiles = {
'1080p': dict(width=1920, height=1080), '1080p': dict(width=1920, height=1080),
'720p': dict(width=1280, height=720), '720p': dict(width=1280, height=720),
'540p': dict(width=960, height=540), '540p': dict(width=960, height=540),
'preview': dict(width=640, height=360, quality=800, skip=1) 'preview': dict(width=640, height=360, spp=1200, skip=1)
} }
def save(out): def save(out):
@ -71,9 +71,7 @@ def main(args, prof):
frames = frames[:args.end] frames = frames[:args.end]
frames = frames[args.start::gprof.skip+1] frames = frames[args.start::gprof.skip+1]
if args.resume: if args.resume:
m = 0 m = os.path.getmtime(args.flame)
if args.flame.name != '-':
m = os.path.getmtime(args.flame.name)
frames = (f for f in frames frames = (f for f in frames
if not os.path.isfile(f[0]) or m > os.path.getmtime(f[0])) if not os.path.isfile(f[0]) or m > os.path.getmtime(f[0]))