mirror-github-bspeice/cuburn
1
0
Fork 0
mirror of https://github.com/stevenrobertson/cuburn.git synced 2025-02-05 11:40:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support arc, offset when importing XML loops

Browse Source
This commit is contained in:
Steven Robertson 2012-01-15 12:48:49 -05:00
parent 830c788263
commit 933e5e50b3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cuburn/genome.py
View File

@ -306,7 +306,7 @@ class XMLGenomeParser(object):
parser.parser.Parse(src, True) parser.parser.Parse(src, True)
return parser.flames return parser.flames
def convert_flame(flame): def convert_flame(flame, arc=-360, offset=0):
""" """
Convert an XML flame (as returned by XMLGenomeParser) into a plain dict Convert an XML flame (as returned by XMLGenomeParser) into a plain dict
in cuburn's JSON genome format representing a loop edge. Caller is in cuburn's JSON genome format representing a loop edge. Caller is
@ -330,7 +330,7 @@ def convert_flame(flame):
info['authors'][0] = info['authors'][0] + ', http://' + flame['url'] info['authors'][0] = info['authors'][0] + ', http://' + flame['url']
time = dict(frame_width=float(flame.get('temporal_filter_width', 1)), time = dict(frame_width=float(flame.get('temporal_filter_width', 1)),
duration=1) duration=abs(arc)/360.)
color = cvt(['brightness', 'gamma']) color = cvt(['brightness', 'gamma'])
color.update((k, float(flame.get(k, d))) for k, d in color.update((k, float(flame.get(k, d))) for k, d in
@ -347,17 +347,17 @@ def convert_flame(flame):
('estimator_curve', 'curve', 0.6)]) ('estimator_curve', 'curve', 0.6)])
num_xf = len(flame['xforms']) num_xf = len(flame['xforms'])
xfs = dict([(str(k), convert_xform(v, num_xf)) xfs = dict([(str(k), convert_xform(v, num_xf, arc, offset))
for k, v in enumerate(flame['xforms'])]) for k, v in enumerate(flame['xforms'])])
if 'symmetry' in flame: if 'symmetry' in flame:
xfs.update(make_symm_xforms(flame['symmetry'], len(xfs))) xfs.update(make_symm_xforms(flame['symmetry'], len(xfs)))
if 'finalxform' in flame: if 'finalxform' in flame:
xfs['final'] = convert_xform(flame['finalxform'], num_xf, True) xfs['final'] = convert_xform(flame['finalxform'], num_xf,
arc, offset, True)
return dict(camera=camera, color=color, de=de, xforms=xfs, return dict(camera=camera, color=color, de=de, xforms=xfs,
info=info, time=time, palettes=[pal], link='self') info=info, time=time, palettes=[pal], link='self')
def convert_xform(xf, num_xf, isfinal=False): def convert_xform(xf, num_xf, arc, offset, isfinal=False):
# TODO: chaos # TODO: chaos
xf = dict(xf) xf = dict(xf)
symm = float(xf.pop('symmetry', 0)) symm = float(xf.pop('symmetry', 0))
@ -366,9 +366,9 @@ def convert_xform(xf, num_xf, isfinal=False):
dict(color=0, color_speed=(1-symm)/2, opacity=1).items()) dict(color=0, color_speed=(1-symm)/2, opacity=1).items())
if not isfinal: if not isfinal:
out['density'] = float(xf.pop('weight')) out['density'] = float(xf.pop('weight'))
out['affine'] = convert_affine(xf.pop('coefs'), anim) out['affine'] = convert_affine(xf.pop('coefs'), arc, offset, anim)
if 'post' in xf and map(float, xf['post'].split()) != [1, 0, 0, 1, 0, 0]: if 'post' in xf and map(float, xf['post'].split()) != [1, 0, 0, 1, 0, 0]:
out['post'] = convert_affine(xf.pop('post')) out['post'] = convert_affine(xf.pop('post'), arc, offset)
if 'chaos' in xf: if 'chaos' in xf:
chaos = map(float, xf.pop('chaos').split()) chaos = map(float, xf.pop('chaos').split())
out['chaos'] = dict() out['chaos'] = dict()
@ -388,7 +388,7 @@ def convert_xform(xf, num_xf, isfinal=False):
assert not xf, 'Unrecognized parameters remain: ' + str(xf) assert not xf, 'Unrecognized parameters remain: ' + str(xf)
return out return out
def convert_affine(aff, animate=False): def convert_affine(aff, arc, offset, animate=False):
xx, yx, xy, yy, xo, yo = map(float, aff.split()) xx, yx, xy, yy, xo, yo = map(float, aff.split())
# Invert all instances of y (yy is inverted twice) # Invert all instances of y (yy is inverted twice)
yx, xy, yo = -yx, -xy, -yo yx, xy, yo = -yx, -xy, -yo
@ -412,7 +412,7 @@ def convert_affine(aff, animate=False):
angle += 360.0 angle += 360.0
if animate: if animate:
angle = [0, angle, 1, angle - 360] angle = [0, angle + offset, 1, angle + arc + offset]
return dict(spread=spread, magnitude={'x': xm, 'y': ym}, return dict(spread=spread, magnitude={'x': xm, 'y': ym},
angle=angle, offset={'x': xo, 'y': yo}) angle=angle, offset={'x': xo, 'y': yo})