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

Rename spec.py to specs.py (prevents clashes)

Browse Source
This commit is contained in:
Steven Robertson 2012-04-14 22:48:10 -07:00
parent b53f703e6e
commit ee2d571e9d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cuburn/code/iter.py
View File

@ -7,7 +7,7 @@ import interp
from util import Template, devlib, ringbuflib from util import Template, devlib, ringbuflib
from mwc import mwclib from mwc import mwclib
import cuburn.genome.spec import cuburn.genome.specs
def precalc_densities(cp): def precalc_densities(cp):
# This pattern recurs a few times for precalc segments. Unfortunately, # This pattern recurs a few times for precalc segments. Unfortunately,
@ -417,7 +417,7 @@ def iter_body(cp):
def mkiterlib(gnm): def mkiterlib(gnm):
packer = interp.GenomePacker('iter_params', 'params', packer = interp.GenomePacker('iter_params', 'params',
cuburn.genome.spec.anim) cuburn.genome.specs.anim)
cp = packer.view(gnm) cp = packer.view(gnm)
iterbody = iter_body(cp) iterbody = iter_body(cp)

8
cuburn/genome/blend.py
View File

@ -36,14 +36,14 @@ def blend(src, dst, edit={}):
for d in src, dst, edit: for d in src, dst, edit:
opts.update(d.get('blend', {})) opts.update(d.get('blend', {}))
blended = merge_nodes(spec.node, src, dst, edit, opts['nloops']) blended = merge_nodes(specs.node, src, dst, edit, opts['nloops'])
name_map = sort_xforms(src['xforms'], dst['xforms'], opts['xform_sort'], name_map = sort_xforms(src['xforms'], dst['xforms'], opts['xform_sort'],
explicit=zip(*opts.get('xform_map', []))) explicit=zip(*opts.get('xform_map', [])))
blended['xforms'] = {} blended['xforms'] = {}
for (sxf_key, dxf_key) in name_map: for (sxf_key, dxf_key) in name_map:
bxf_key = (sxf_key or 'pad') + '_' + (dxf_key or 'pad') bxf_key = (sxf_key or 'pad') + '_' + (dxf_key or 'pad')
xf_edits = merge_edits(spec.xform, xf_edits = merge_edits(specs.xform,
get(edit, {}, 'xforms', 'src', sxf_key), get(edit, {}, 'xforms', 'src', sxf_key),
get(edit, {}, 'xforms', 'dst', dxf_key)) get(edit, {}, 'xforms', 'dst', dxf_key))
blended['xforms'][bxf_key] = blend_xform( blended['xforms'][bxf_key] = blend_xform(
@ -65,7 +65,7 @@ def merge_edits(sv, av, bv):
""" """
Merge the values of ``av`` and ``bv`` according to the spec ``sv``. Merge the values of ``av`` and ``bv`` according to the spec ``sv``.
""" """
if isinstance(spec, (dict, spectypes.Map)): if isinstance(sv, (dict, spectypes.Map)):
av, bv = av or {}, bv or {} av, bv = av or {}, bv or {}
getsv = lambda k: sv.type if isinstance(sv, spectypes.Map) else sv[k] getsv = lambda k: sv.type if isinstance(sv, spectypes.Map) else sv[k]
return dict([(k, merge_edits(getsv(k), av.get(k), bv.get(k))) return dict([(k, merge_edits(getsv(k), av.get(k), bv.get(k)))
@ -142,7 +142,7 @@ def blend_xform(sxf, dxf, edits, loops, isfinal=False):
sxf = padding_xform(dxf, isfinal) sxf = padding_xform(dxf, isfinal)
if dxf is None: if dxf is None:
dxf = padding_xform(sxf, isfinal) dxf = padding_xform(sxf, isfinal)
return merge_nodes(spec.xform, sxf, dxf, edits, loops) return merge_nodes(specs.xform, sxf, dxf, edits, loops)
# If xin contains any of these, use the inverse identity # If xin contains any of these, use the inverse identity
hole_variations = ('spherical ngon julian juliascope polar ' hole_variations = ('spherical ngon julian juliascope polar '

0
cuburn/genome/spec.py → cuburn/genome/specs.py
View File

2
cuburn/genome/use.py
View File

@ -1,7 +1,7 @@
import numpy as np import numpy as np
from spectypes import Spline, Scalar, RefScalar, Map, List, TypedList from spectypes import Spline, Scalar, RefScalar, Map, List, TypedList
from spec import toplevels from specs import toplevels
class Wrapper(object): class Wrapper(object):
def __init__(self, val, spec=None, path=()): def __init__(self, val, spec=None, path=()):