diff --git a/render.py b/render.py index c9c559f..8c92656 100644 --- a/render.py +++ b/render.py @@ -153,7 +153,8 @@ def compose(clips, target=150, base=1024, voice_over=None): clip['foreground3'] elif chance(seq, 0.5): fg = clip['foreground2'] - transparancy = seq() / 10 + transparancy = seq() / 9 + transparancy = 1 if 'foley' in clip: foley = clip['foley'] else: @@ -166,7 +167,8 @@ def compose(clips, target=150, base=1024, voice_over=None): } }) - transparency = seq() / 10 + transparency = seq() / 9 + transparancy = 1 # coin flip which site is visible (50% chance) if chance(seq, 0.5): transparency_front = transparency @@ -174,7 +176,7 @@ def compose(clips, target=150, base=1024, voice_over=None): else: transparency_back = transparency transparency_front = 0 - #transparency_original = seq() / 10 + transparency_original = seq() / 9 transparency_original = 1 if "background" in clip: scene['front']['V1'].append({ @@ -287,13 +289,14 @@ def get_fragments(clips, voice_over): if l.name.split(' ')[0].isdigit(): fragment = { 'name': l.name, - 'tags': [t['value'] for t in l.query['conditions'][1]['conditions']], + 'tags': [t['value'] for t in l.query['conditions'][1]['conditions'] if t['operator'] == '=='], + 'anti-tags': [t['value'] for t in l.query['conditions'][1]['conditions'] if t['operator'] == '!='], 'description': l.description } fragment["id"] = int(fragment['name'].split(' ')[0]) fragment['clips'] = [] for clip in clips: - if set(clip['tags']) & set(fragment['tags']): + if set(clip['tags']) & set(fragment['tags']) and not set(clip['tags']) & set(fragment['anti-tags']): fragment['clips'].append(clip) fragment["voice_over"] = voice_over.get(str(fragment["id"]), {}) fragments.append(fragment)