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

Fetch defaults when packing interped params

Browse Source
This commit is contained in:
Steven Robertson 2012-04-14 22:57:11 -07:00
parent 627bcf8921
commit e7cb39b456
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cuburn/code/interp.py
View File

@ -2,6 +2,8 @@ from collections import OrderedDict
from itertools import cycle from itertools import cycle
import numpy as np import numpy as np
from cuburn.genome import specs
from cuburn.genome.util import resolve_spec
from cuburn.genome.use import Wrapper, SplineEval from cuburn.genome.use import Wrapper, SplineEval
import util import util
@ -30,7 +32,7 @@ class PackerWrapper(Wrapper):
self.packer, self.path = packer, path self.packer, self.path = packer, path
def wrap_dict(self, path, spec, val): def wrap_dict(self, path, spec, val):
return type(self)(self.packer, val, spec, path) return type(self)(self.packer, val or {}, spec, path)
def wrap_spline(self, path, spec, val): def wrap_spline(self, path, spec, val):
return PackerSpline(self.packer, path, spec) return PackerSpline(self.packer, path, spec)
@ -209,6 +211,9 @@ class GenomePacker(object):
for idx, path in enumerate(self.genome): for idx, path in enumerate(self.genome):
attr = gnm attr = gnm
for name in path: for name in path:
if name not in attr:
attr = resolve_spec(specs.anim, path).default
break
attr = attr[name] attr = attr[name]
attr = SplineEval.normalize(attr) attr = SplineEval.normalize(attr)
times[idx,:len(attr[0])] = attr[0] times[idx,:len(attr[0])] = attr[0]