eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-15 04:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

overhaul mod bank screen (not sure its better tho), lfomodulation and modulation values saved with presets, refactor some frame stuff to make more readable & maintainable

Browse Source
This commit is contained in:
Tristan Rowley
2020-03-08 22:43:06 +00:00
parent 35db76322e
commit 3c93900392
4 changed files with 162 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
display_centre/display.py
View File

@@ -282,14 +282,14 @@ class Display(object):
shader = self.shaders.selected_shader_list[self.data.shader_layer]
for i in range(min(4,shader['param_number'])):
"""for i in range(min(4,shader['param_number'])):
display_param = self.format_param_value(self.shaders.selected_param_list[self.data.shader_layer][i])
if display_param == 100:
display_param == 99
self.display_text.insert(END, 'x{}:{:02d}'.format(i, display_param))
self.display_text.insert(END, 'x{}:{:02d}'.format(i, display_param))"""
self.display_text.insert(END, '\n')
for index, slot in enumerate(shader_bank_data):
"""for index, slot in enumerate(shader_bank_data):
name_without_extension = slot['name'].rsplit('.',1)[0]
#self.display_text.insert(END, '{:^6} {:<17} {:<5} '.format(index, name_without_extension[0:17], slot['shad_type']))
self.display_text.insert(END, '{:^2} {:<14} {:<3} '.format(index, name_without_extension[0:14], slot['shad_type']))
@@ -309,20 +309,20 @@ class Display(object):
if current_slot is not None:
self._highlight_this_row(current_slot, gray=not_playing_tag)
self._highlight_this_param(self.shaders.focused_param)
self._highlight_this_param(self.shaders.focused_param) """
# show info about the modulation configuration
#self.display_text.insert(END, "Lyr|1a b c d|2a b c d|3a b c d|4a b c d\n")
self.display_text.insert(END, "Lyr")
for i in range(4):
#self.display_text.insert(END, "Lyr")
"""for i in range(4):
self.display_text.insert(END, "|%s"%i)
for i in range(4):
a = 'abcd'[i]
if i==self.shaders.selected_modulation_slot:
a = a.upper()
self.display_text.insert(END, "%s "%a)
self.display_text.insert(END, "\n")
for layer, modulations in enumerate(self.shaders.modulation_level):
self.display_text.insert(END, "%s "%a)"""
#self.display_text.insert(END, "\n")
"""for layer, modulations in enumerate(self.shaders.modulation_level):
if (layer==self.data.shader_layer):
self.display_text.insert(END, '*')
else:
@@ -333,7 +333,24 @@ class Display(object):
for slot,level in enumerate(levels):
self.display_text.insert(END, ' %s'%self.get_bar(level))
self.display_text.insert(END, ' ')
self.display_text.insert(END, '\n')
self.display_text.insert(END, '\n')"""
for layer in range(3):
o = ""
o += self.data.plugins.fm.get_live_frame().get_shader_layer_summary(layer)
o += "\n Modmatrix:\t"
name = self.shaders.selected_shader_list[layer].get('name').strip()
#o = ""
for slot in range(4):
sl = 'ABCD'[slot]
if slot != self.shaders.selected_modulation_slot:
sl = sl.lower()
o+= sl + "["
for param in range(4):
o += self.get_bar(self.shaders.modulation_level[layer][param][slot])
o+= "] "
self.display_text.insert(END, "%s %s:\t%s\n\n"%(">" if layer==self.data.shader_layer else " ", layer, o))
# todo: this doesnt work but would be a better way to highlight the selected modulation slot/layer

30
plugins/LFOModulation.py
View File

@@ -1,8 +1,8 @@
import math
import data_centre.plugin_collection
from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin
from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin, AutomationSourcePlugin
class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin, AutomationSourcePlugin):
MAX_LFOS = 4
@@ -43,6 +43,27 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
display.display_text.insert(END, "{}\t{}\n".format(self.last_lfo_status[lfo], display.get_bar(self.last_lfo_value[lfo])))
display.display_text.insert(END, "\t%s\n" % self.formula[lfo])
# AutomationSourcePlugin methods
# methods/vars for AutomationSourcePlugin
# a lot of the nitty-gritty handled in parent class, these are for interfacing to the plugin
def get_frame_data(self):
diff = { 'levels': self.level, 'speed': self.speed }
#self.last_record = {}
#print(">>> reporting frame data for rec\n\t%s" % diff)
return diff
def recall_frame_data(self, data):
if data is None:
return
# print(">>>>recall from data:\n\t%s\n" %data)
"""for queue, item in data.items():
if item is not None:
self.send_buffered(queue, item[0], item[1], record = False)"""
if data.get('levels') is not None:
for slot,level in enumerate(data.get('levels')):
self.set_lfo_modulation_level(slot, level)
if data.get('speed') is not None:
self.set_lfo_speed_direct(data.get('speed'))
# ActionsPlugin methods
@property
@@ -58,7 +79,10 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
self.level[slot] = value
def set_lfo_speed(self, speed):
self.speed = -4*(0.5-(speed))
self.set_lfo_speed_direct(-4*(0.5-(speed)))
def set_lfo_speed_direct(self, speed):
self.speed = speed
def toggle_lfo_active(self):
self.active = not self.active

174
plugins/frame_manager.py
View File

@@ -27,6 +27,8 @@ class Frame:
def get(self, key, default=None):
return self.f.get(key,default)
def has(self, key):
return self.get(key) is not None
def store_live(self):
frame = {
@@ -37,7 +39,8 @@ class Frame:
'feedback_active': self.pc.shaders.data.feedback_active,
'x3_as_speed': self.pc.shaders.data.settings['shader']['X3_AS_SPEED']['value'],
'shader_speeds': copy.deepcopy(self.pc.shaders.selected_speed_list),
'strobe_amount': self.pc.shaders.data.settings['shader']['STROBE_AMOUNT']['value'] / 10.0
'strobe_amount': self.pc.shaders.data.settings['shader']['STROBE_AMOUNT']['value'] / 10.0,
'shader_modulation_levels': copy.deepcopy(self.pc.shaders.modulation_level)
}
#print("about to call get_plugin_frame_data")
frame.update(self.pc.fm.get_plugin_frame_data())
@@ -56,49 +59,11 @@ class Frame:
self.f = {}
return self
def recall_frame_params(self):
#print("recall_frame_params got: %s" % preset.get('shader_params'))
for (layer, param_list) in enumerate(self.get('shader_params',[])):
if param_list:
for param,value in enumerate(param_list):
#if (ignored is not None and ignored['shader_params'][layer][param] is not None):
# print ("ignoring %s,%s because value is %s" % (layer,param,ignored['shader_params'][layer][param]))
# continue
if (value is not None):
#print("recalling layer %s param %s: value %s" % (layer,param,value))
self.pc.actions.call_method_name('set_the_shader_param_%s_layer_%s_continuous' % (param,layer), value)
if self.get('feedback_active') is not None:
self.pc.data.feedback_active = self.get('feedback_active',self.pc.data.feedback_active)
if self.pc.data.feedback_active:
self.pc.actions.call_method_name('enable_feedback')
else:
self.pc.actions.call_method_name('disable_feedback')
if self.get('x3_as_speed') is not None:
self.pc.data.settings['shader']['X3_AS_SPEED']['value'] = self.get('x3_as_speed',self.pc.data.settings['shader']['X3_AS_SPEED']['value'])
"""if self.data.settings['shader']['X3_AS_SPEED']['value']:
self.data.plugins.actions.call_method_name('enable_x3_as_speed')
else:
self.data.plugins.actions.call_method_name('disable_x3_as_speed')"""
for (layer, speed) in enumerate(self.get('shader_speeds',[])):
if speed is not None:
self.pc.actions.call_method_name('set_shader_speed_layer_%s_amount' % layer, speed)
if self.get('strobe_amount') is not None:
self.pc.actions.set_strobe_amount_continuous(self.get('strobe_amount'))
from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin):
#print("recalling for plugin %s with data %s" % (plugin, self.get(plugin.frame_key)))
plugin.recall_frame_data(self.get(plugin.frame_key))
def get_active_shader_names(self):
s = ""
if self.get('selected_shader_slots') is None:
if self.has('selected_shader_slots'):
return ['-']*3
if self.get('selected_shader') is not None:
if self.has('selected_shader'):
return [ shader['name'].strip() for shader in self.get('selected_shader') ]
return [ self.pc.data.shader_bank_data[layer][x].get('name').strip() if x is not None else '-'\
for layer,x in enumerate(self.get('selected_shader_slots',[None]*3))
@@ -111,26 +76,7 @@ class Frame:
# list the recorded shader info in compact format
names = self.get_active_shader_names()
for layer in range(0,3): # number of shader layers
s = "%s " % layer
s += "["
s += self.pc.display.get_compact_indicators([\
(i==self.get('selected_shader_slots',[-1]*3)[layer]) or\
(self.get('selected_shader') is not None and self.pc.data.shader_bank_data[layer][i]['name'] == self.get('selected_shader')[layer]['name'])\
for i in range(10)\
])
s += "]"
if self.get('layer_active_status') is not None:
s += " %s " % (self.get('layer_active_status',['-']*3)[layer])
if self.get('selected_shader'):
s += "{:14.14}".format(self.get('selected_shader')[layer].get('name').replace('.frag','').strip())
s += " " + self.get_shader_param_summary(layer) + " "
if self.get('shader_speeds') is not None:
s += self.pc.display.get_speed_indicator(self.get('shader_speeds',[0.0]*3)[layer])
s = self.get_shader_layer_summary(layer)
summary.append(s)
# handle summarising the rest of the recorded shader info, two-to-a-line where possible
@@ -140,6 +86,18 @@ class Frame:
if key in ["selected_shader","layer_active_status","shader_params","shader_speeds","selected_shader_slots"]:
# skip these as dealt with above
pass
elif key in ['shader_modulation_levels']:
for layer in range(3):
o = ""
for slot in range(4):
sl = 'ABCD'[slot]
if slot != self.pc.shaders.selected_modulation_slot:
sl = sl.lower()
o+= sl + "["
for param in range(4):
o += self.pc.display.get_bar(d[layer][param][slot])
o+= "] "
summary.append("Shader layer %s: %s"%(layer,o))
elif key in ["WJSendPlugin"]:
# tends to be heavy so save it for later
# TODO: ask plugin to format the data for summary?
@@ -161,6 +119,31 @@ class Frame:
return summary
def get_shader_layer_summary(self, layer):
s = "%s%s" % (layer, " " if layer != self.pc.data.shader_layer else ">")
s += "["
s += self.pc.display.get_compact_indicators([\
(i==self.get('selected_shader_slots',[-1]*3)[layer]) or\
(self.has('selected_shader') and self.pc.data.shader_bank_data[layer][i]['name'] == self.get('selected_shader')[layer]['name'])\
for i in range(10)\
])
s += "]"
if self.has('layer_active_status'):
s += " %s " % (self.get('layer_active_status',['-']*3)[layer])
if self.get('selected_shader'):
s += "{:14.14}".format(self.get('selected_shader')[layer].get('name').replace('.frag','').strip())
s += " " + self.get_shader_param_summary(layer) + " "
if self.has('shader_speeds'):
s += self.pc.display.get_speed_indicator(self.get('shader_speeds',[0.0]*3)[layer])
return s
def get_shader_param_summary(self, layer):
if self.get('shader_params') is None:
return ""
@@ -181,9 +164,9 @@ class Frame:
self.recall_frame_params()
for layer in range(3):
if preset.get('selected_shader_slots') is not None: # deprecated/compatibility
if preset.has('selected_shader_slots'): # deprecated/compatibility
self.pc.actions.call_method_name('play_shader_%s_%s' % (layer, preset.get('selected_shader_slots')[layer]))
elif preset.get('selected_shader') is not None and preset.get('selected_shader')[layer] is not None:
elif preset.has('selected_shader') and preset.get('selected_shader')[layer] is not None:
# match selected shader to a slot and call that back if it exists
found = False
for slot,shader in enumerate(self.pc.data.shader_bank_data[layer]):
@@ -195,6 +178,13 @@ class Frame:
self.pc.shaders.selected_shader_list[self.pc.data.shader_layer] = preset.get('selected_shader')[layer].copy()
self.pc.shaders.load_selected_shader()
if preset.has('shader_modulation_levels'):
for layer in range(3):
for param in range(4):
for slot in range(4):
level = preset.get('shader_modulation_levels')[layer][param][slot]
self.pc.shaders.set_param_layer_slot_modulation_level(param, layer, slot, level)
for (layer, active) in enumerate(preset.get('layer_active_status',[])):
# print ("got %s layer with status %s " % (layer,active))
if active=='▶':
@@ -202,6 +192,44 @@ class Frame:
else:
self.pc.actions.call_method_name('stop_shader_layer_%s' % layer)
def recall_frame_params(self):
#print("recall_frame_params got: %s" % preset.get('shader_params'))
for (layer, param_list) in enumerate(self.get('shader_params',[])):
if param_list:
for param,value in enumerate(param_list):
#if (ignored is not None and ignored['shader_params'][layer][param] is not None):
# print ("ignoring %s,%s because value is %s" % (layer,param,ignored['shader_params'][layer][param]))
# continue
if (value is not None):
#print("recalling layer %s param %s: value %s" % (layer,param,value))
self.pc.actions.call_method_name('set_the_shader_param_%s_layer_%s_continuous' % (param,layer), value)
if self.has('feedback_active'):
self.pc.data.feedback_active = self.get('feedback_active',self.pc.data.feedback_active)
if self.pc.data.feedback_active:
self.pc.actions.call_method_name('enable_feedback')
else:
self.pc.actions.call_method_name('disable_feedback')
if self.has('x3_as_speed'):
self.pc.data.settings['shader']['X3_AS_SPEED']['value'] = self.get('x3_as_speed',self.pc.data.settings['shader']['X3_AS_SPEED']['value'])
"""if self.data.settings['shader']['X3_AS_SPEED']['value']:
self.data.plugins.actions.call_method_name('enable_x3_as_speed')
else:
self.data.plugins.actions.call_method_name('disable_x3_as_speed')"""
for (layer, speed) in enumerate(self.get('shader_speeds',[])):
if speed is not None:
self.pc.actions.call_method_name('set_shader_speed_layer_%s_amount' % layer, speed)
if self.has('strobe_amount'):
self.pc.actions.set_strobe_amount_continuous(self.get('strobe_amount'))
from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin):
#print("recalling for plugin %s with data %s" % (plugin, self.get(plugin.frame_key)))
plugin.recall_frame_data(self.get(plugin.frame_key))
def merge(self, frame2):
from copy import deepcopy
f = deepcopy(self.f) #frame1.copy()
@@ -214,10 +242,10 @@ class Frame:
f['shader_params'] = [[None]*4,[None]*4,[None]*4]
f['shader_params'][i][i2] = p
if frame2.get('feedback_active') is not None:
if frame2.has('feedback_active'):
f['feedback_active'] = frame2['feedback_active']
if frame2.get('x3_as_speed') is not None:
if frame2.has('x3_as_speed'):
f['x3_as_speed'] = frame2.get('x3_as_speed')
if f.get('shader_speeds') is None:
@@ -248,15 +276,15 @@ class Frame:
for i2,p in enumerate(f2):
if ignored['shader_params'][i][i2] is not None:
f['shader_params'][i][i2] = None
if ignored.get('feedback_active') is not None:
if ignored.has('feedback_active'):
f['feedback_active'] = None
if ignored.get('x3_as_speed') is not None:
if ignored.has('x3_as_speed'):
f['x3_as_speed'] = None
if ignored.get('shader_speeds') is not None and frame.get('shader_speeds') is not None:
if ignored.has('shader_speeds') and frame.has('shader_speeds'):
for i,s in enumerate(frame.get('shader_speeds')):
if ignored['shader_speeds'][i] is not None:
f['shader_speeds'][i] = None
if ignored.get('strobe_amount') is not None:
if ignored.has('strobe_amount'):
f['strobe_amount'] = None
from data_centre.plugin_collection import AutomationSourcePlugin
@@ -274,11 +302,11 @@ class Frame:
frame = self.f
if self.DEBUG_FRAMES: print("is_frame_empty: got frame\t%s" % frame)
if frame.get('feedback_active') is not None:
if self.has('feedback_active'):
return False
if frame.get('x3_as_speed') is not None:
if self.has('x3_as_speed'):
return False
if frame.get('strobe_amount') is not None:
if self.has('strobe_amount'):
return False
for i,f in enumerate(frame['shader_params']):
@@ -286,7 +314,7 @@ class Frame:
if p is not None: #ignored['shader_params'][i][i2] is not None:
return False
if frame.get('shader_speeds') is not None:
if self.has('shader_speeds'):
for i,f in enumerate(frame['shader_speeds']):
if f is not None:
return False

8
video_centre/shaders.py
View File

@@ -34,6 +34,9 @@ class Shaders(object):
return self.data.settings['shader'].setdefault('modulation_level',
[[[0.0,0.0,0.0,0.0] for i in range(4)] for i in range(3)])
def set_modulation_levels(self, levels):
self.data.settings['shader']['modulation_level'] = levels
def generate_shaders_list(self):
shaders_menu_list = []
raw_list = self.shaders_menu.generate_raw_shaders_list()
@@ -249,7 +252,10 @@ class Shaders(object):
self.set_param_layer_modulation_level(param, layer, level)
def set_param_layer_modulation_level(self, param, layer, level):
self.modulation_level[layer][param][self.selected_modulation_slot] = level
self.set_param_layer_slot_modulation_level(param, layer, self.selected_modulation_slot, level)
def set_param_layer_slot_modulation_level(self, param, layer, slot, level):
self.modulation_level[layer][param][slot] = level
self.update_param_layer(param, layer)
def update_param_layer(self, param, layer):