diff -urN rt_v43/dat.py rt_v44/dat.py --- rt_v43/dat.py 2018-05-24 20:19:08.000000000 +0900 +++ rt_v44/dat.py 2018-06-03 04:49:15.000000000 +0900 @@ -277,23 +277,6 @@ return sum( map( d_setup, [d0,d1] ), [] ) ### - if 'rxs' in d: - rxs = d.get('rxs') - if not rxs: - d.pop('rxs') - return d_setup(d) - (targ_k, i_a, n, lx) = rxs.pop(0) - - targ = d.get(targ_k, []) - ds = [] - for i in range(n): - d_ = d_copy(d) - d_[targ_k] = targ[:] - ds.append(d_) - targ = lx + targ if i_a == 'insert' else targ + lx - return sum( map( d_setup, ds ), [] ) - ### - if_not_set_opt( d, 'l2m', [] ) if_not_set_opt( d, 'm2g', [] ) if_not_set_opt( d, 'l2g', d.get('l2m') + d.get('m2g') ) @@ -321,12 +304,32 @@ ds = [] for d_ in data: d_['m2g'] = d_.get('m2g', []) + d.get('l2g') + if 'rxs' in d: + d_['rxs'] = d_.get('rxs', []) + d.get('rxs') ds += d_setup(d_) for d_ in ds: d_['maps'] = d_.get('maps', []) + d.get('maps', []) return ds ### + if 'rxs' in d: + rxs = d.get('rxs') + if not rxs: + d.pop('rxs') + return d_setup(d) + (targ_k, i_a, n, lx) = rxs.pop(0) + + targ = d.get(targ_k, []) + d.pop('l2g') + ds = [] + for i in range(n): + d_ = d_copy(d) + d_[targ_k] = targ[:] + ds.append(d_) + targ = lx + targ if i_a == 'insert' else targ + lx + return sum( map( d_setup, ds ), [] ) + ### + kinds = [ 'square', 'circle', 'triangle', 'ball', 'pipe_side', 'cone_side' ] if not val.cli.has_prop('kinds'): val.cli.set_prop( 'kinds', '[str]', kinds ) diff -urN rt_v43/dat4.yaml rt_v44/dat4.yaml --- rt_v43/dat4.yaml 1970-01-01 09:00:00.000000000 +0900 +++ rt_v44/dat4.yaml 2018-06-03 04:12:50.000000000 +0900 @@ -0,0 +1,46 @@ +pillar: +- kind: cube + rtd: { base: 0.1, diff: 0, reflect: 0.5, reflact: 0.5, density: 2 } + m2g: [ ax.zoom_z(10) ] +- kind: pipe + rtd: { base: 0.1, diff: 0, reflect: 0.5, reflact: 0.5, density: 2 } + m2g: [ 'ax.zoom([2,2,1])', ax.slide_z(-11) ] + rxs: + - [ m2g, append, 2, [ ax.slide_z(22) ] ] + +big_ball: +- kind: ball + rtd: { diff: 0.3 } + maps: + - fn: IMG_3999_4.mov + fn_r: IMG_3999_4.mov + t2m: [ ax.zoom_all(2), ax.rot_x(90) ] + - fn: IMG_3999_4.mov + fn_r: IMG_3999_4.mov + t2m: [ ax.zoom_all(2), ax.rot_x(90), ax.rot_z(180) ] + m2g: [ ax.zoom_all(1000) ] + +colosseum: +- kind: export + export: pillar + m2g: [ ax.slide_x(20) ] + rxs: + - [ m2g, append, 16, [ ax.rot_z(360.0/16) ] ] +- kind: pipe + rtd: { base: 0.1, diff: 0, reflect: 0.5, reflact: 0.5, density: 2 } + m2g: [ 'ax.zoom([24,24,1])', ax.slide_z(-13) ] + rxs: + - [ m2g, append, 2, [ ax.slide_z(26) ] ] + +all: +- kind: export + export: colosseum + rxs: + - [ m2g, append, 2, [ ax.zoom(6) ] ] +- kind: ball + rtd: { base: 0.1, diff: 0, reflect: 0.5, reflact: 0.5, density: 2 } + m2g: [ ax.zoom_all(6) ] +- kind: export + export: big_ball + +# EOF