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-14 12:20:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

improvements to LFOModulation plugin - speed control, tidy up

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-21 19:55:28 +00:00
parent ebd6859490
commit a055c5585c
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
json_objects/midi_action_mapping_APC Key 25.json
View File

@@ -68,7 +68,8 @@
"control_change 52": { "control_change 52": {
"DEFAULT": ["set_the_shader_param_0_layer_offset_1_continuous","set_param_0_layer_offset_0_modulation_level_continuous"], "DEFAULT": ["set_the_shader_param_0_layer_offset_1_continuous","set_param_0_layer_offset_0_modulation_level_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"], "NAV_DETOUR": ["set_detour_speed_position_continuous"],
"NAV_WJMX": ["wj_set_mix","wj_send_append_pad_2_VCG:T"] "NAV_WJMX": ["wj_set_mix","wj_send_append_pad_2_VCG:T"],
"NAV_LFO": ["set_lfo_speed"]
}, },
"control_change 53": { "control_change 53": {
"DEFAULT": ["set_the_shader_param_1_layer_offset_1_continuous","set_param_1_layer_offset_0_modulation_level_continuous"], "DEFAULT": ["set_the_shader_param_1_layer_offset_1_continuous","set_param_1_layer_offset_0_modulation_level_continuous"],

26
plugins/LFOModulation.py
View File

@@ -33,7 +33,9 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, '{} \n'.format(display.body_title))
display.display_text.insert(END, "LFOModulationPlugin ") display.display_text.insert(END, "LFOModulationPlugin ")
display.display_text.insert(END, "ACTIVE\n\n" if self.active else "not active\n\n") display.display_text.insert(END, "ACTIVE" if self.active else "not active")
display.display_text.insert(END, "\tSpeed: {:03.2f}\n\n".format(self.speed))
for lfo,value in enumerate(self.level): for lfo,value in enumerate(self.level):
display.display_text.insert(END, "lfo {} level: {:03.2f}%\t".format(lfo,value)) display.display_text.insert(END, "lfo {} level: {:03.2f}%\t".format(lfo,value))
@@ -46,13 +48,17 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
def parserlist(self): def parserlist(self):
return [ return [
( r"^set_lfo_modulation_([0-3])_level$", self.set_lfo_modulation_level ), ( r"^set_lfo_modulation_([0-3])_level$", self.set_lfo_modulation_level ),
( r"^toggle_lfo_active$", self.toggle_lfo_active ) ( r"^toggle_lfo_active$", self.toggle_lfo_active ),
( r"^set_lfo_speed", self.set_lfo_speed )
# TODO: changing formulas and LFO modes, speed # TODO: changing formulas and LFO modes, speed
] ]
def set_lfo_modulation_level(self, slot, value): def set_lfo_modulation_level(self, slot, value):
self.level[slot] = value self.level[slot] = value
def set_lfo_speed(self, speed):
self.speed = -4*(0.5-(speed))
def toggle_lfo_active(self): def toggle_lfo_active(self):
self.active = not self.active self.active = not self.active
@@ -61,16 +67,17 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
# TODO: save & load this to config file, make editable # TODO: save & load this to config file, make editable
formula = [ formula = [
"f_sin", "f_sin",
"f_inverted_sin", "f_double_sin",
"f_sin", "f_sin",
"f_inverted_sin" "f_double_sin"
] ]
# run the formula for the stored lfo configuration # run the formula for the stored lfo configuration
last_lfo_status = [None]*MAX_LFOS # for displaying status last_lfo_status = [None]*MAX_LFOS # for displaying status
#lfo_speed = [1.0]*MAX_LFOS
def getLFO(self, position, lfo): def getLFO(self, position, lfo):
lfo_value = getattr(self,self.formula[lfo])(position, self.level[lfo]) lfo_value = getattr(self,self.formula[lfo])(position, self.level[lfo])
self.last_lfo_status[lfo] = " output {:03.2f}\tat T{:03.2f}".format(lfo_value*100.0, position) self.last_lfo_status[lfo] = " sent {:03.1f}%".format(lfo_value*100.0) #, position*self.lfo_speed[lfo])
return lfo_value return lfo_value
# built-in waveshapes # built-in waveshapes
@@ -78,8 +85,8 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
def f_sin(self, position, level): def f_sin(self, position, level):
return 0.5+(0.5*level * math.sin(position*math.pi)) return 0.5+(0.5*level * math.sin(position*math.pi))
def f_inverted_sin(self, position, level): def f_double_sin(self, position, level):
return self.f_sin(1.0-position, 1.0-level) return self.f_sin(position, math.sin(level+0.5*math.pi))
# SequencePlugin methods # SequencePlugin methods
def run_sequence(self, position): def run_sequence(self, position):
@@ -92,5 +99,6 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
if not self.active: if not self.active:
return return
for i in range(0,4): for lfo in range(0,4):
self.pc.actions.call_method_name("modulate_param_%s_to_amount_continuous"%i, self.getLFO(position, i)) if self.level[lfo]>0.0:
self.pc.actions.call_method_name("modulate_param_%s_to_amount_continuous"%lfo, self.getLFO(position, lfo))