From 5cbbf67886af5c3f53452026dca80614d55ba3d4 Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Mon, 16 Apr 2012 01:32:14 -0700 Subject: [PATCH] Fixes for name errors in conversion functions --- cuburn/genome/convert.py | 6 +++--- main.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cuburn/genome/convert.py b/cuburn/genome/convert.py index 9e4d200..3358e94 100644 --- a/cuburn/genome/convert.py +++ b/cuburn/genome/convert.py @@ -88,18 +88,18 @@ def convert_xform(xf): def make_symm_xforms(kind, offset): assert kind != 0, 'Pick your own damn symmetry.' 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}}) if kind < 0: out.append(boring_xf.copy()) - out[-1]['affine'] = dict(angle=135, spread=-45) + out[-1]['pre_affine'] = dict(angle=135, spread=-45) kind = -kind for i in range(1, kind): out.append(boring_xf.copy()) if kind >= 3: out[-1]['color'] = (i - 1) / (kind - 2.0) 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)) def convert_xforms(flame): diff --git a/main.py b/main.py index 1547556..c9455de 100644 --- a/main.py +++ b/main.py @@ -29,7 +29,7 @@ profiles = { '1080p': dict(width=1920, height=1080), '720p': dict(width=1280, height=720), '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): @@ -71,9 +71,7 @@ def main(args, prof): frames = frames[:args.end] frames = frames[args.start::gprof.skip+1] if args.resume: - m = 0 - if args.flame.name != '-': - m = os.path.getmtime(args.flame.name) + m = os.path.getmtime(args.flame) frames = (f for f in frames if not os.path.isfile(f[0]) or m > os.path.getmtime(f[0]))