diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-05-21 13:23:11 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-05-21 13:23:11 +0200 |
| commit | 5ab2f7ebf279f7bacd20d1426b73958630a41263 (patch) | |
| tree | d15bfeeebcb20c67fd79b2f00169abc1bb6a3ea5 | |
| parent | 6984d1b09f88d39b7bc4775871cece6f6c409b97 (diff) | |
vars..
| -rw-r--r-- | live-mogrify.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/live-mogrify.py b/live-mogrify.py index 4327f69..1c20710 100644 --- a/live-mogrify.py +++ b/live-mogrify.py @@ -198,13 +198,16 @@ def process_live_input(opt, data_opt, rpc_client): if data_opt.sequence and A_dir is not None: A_img = Image.open(sequence_path).convert('RGB') A_im = np.asarray(A_img) + frac_a = data_opt.recursive_frac + frac_b = data_opt.sequence_frac + frac_sum = frac_a + frac_b + if frac_sum > 1.0 + frac_a = frac_a / frac_sum + frac_b = frac_b / frac_sum if data_opt.transition: t = lerp(math.sin(i / data_opt.transition_period * math.pi * 2.0 ) / 2.0 + 0.5, data_opt.transition_min, data_opt.transition_max) - frac_a = data_opt.recursive_frac * (1.0 - t) - frac_b = data_opt.sequence_frac * (1.0 - t) - else: - frac_a = data_opt.recursive_frac - frac_b = data_opt.sequence_frac + frac_a *= 1.0 - t + frac_b *= 1.0 - t frac_c = 1.0 - frac_a - frac_b array_a = np.multiply(last_im.astype('float64'), frac_a) array_b = np.multiply(A_im.astype('float64'), frac_b) |