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-11 19:00:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature_plugins' into feature_plugins_shader_gadgets

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-16 17:40:39 +00:00
parent 0d95731d49 5db835e6f8
commit 7400228cad
7 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,6 +1,10 @@
*.pyc *.pyc
*.log *.log
.vscode .vscode
*.swp
json_objects/display_data.json json_objects/display_data.json
json_objects/shader_bank_data.json json_objects/shader_bank_data.json
json_objects/settings.json json_objects/settings.json
*.patch
*.orig
*.rej

2
data_centre/plugin_collection.py
View File

@@ -222,7 +222,6 @@ class DisplayPlugin(Plugin):
#display_text.insert(END, 'test from DisplayPlugin') #display_text.insert(END, 'test from DisplayPlugin')
display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, '{} \n'.format(display.body_title))
class ModulationReceiverPlugin(Plugin): class ModulationReceiverPlugin(Plugin):
def __init__(self, plugin_collection): def __init__(self, plugin_collection):
super().__init__(plugin_collection) super().__init__(plugin_collection)
@@ -231,7 +230,6 @@ class ModulationReceiverPlugin(Plugin):
print("||||||set_modulation_value dummy!") print("||||||set_modulation_value dummy!")
raise NotImplementedError raise NotImplementedError
class AutomationSourcePlugin(Plugin): class AutomationSourcePlugin(Plugin):
@property @property
def frame_key(self): def frame_key(self):

26
json_objects/midi_action_mapping_APC Key 25.json
View File

@@ -42,45 +42,49 @@
"control_change 48": { "control_change 48": {
"DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous","set_strobe_amount_continuous"], "DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous","set_strobe_amount_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"], "NAV_DETOUR": ["set_detour_speed_position_continuous"],
"WJMXSEND": ["wj_set_position_N_x"], "NAV_WJMX": ["wj_set_position_N_x"],
"MANIPULA": ["set_variable_A"], "NAV_MANI": ["set_variable_A"],
"LOOPREC": ["set_automation_speed"] "NAV_LPRC": ["set_automation_speed"],
"NAV_LFO": ["set_lfo_modulation_0_level"]
}, },
"control_change 49": { "control_change 49": {
"DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous","set_shader_speed_layer_0_amount"], "DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous","set_shader_speed_layer_0_amount"],
"NAV_DETOUR": ["set_detour_start_continuous"], "NAV_DETOUR": ["set_detour_start_continuous"],
"WJMXSEND": ["wj_set_position_N_y"], "NAV_WJMX": ["wj_set_position_N_y"],
"MANIPULA": ["f:sin(x*pi):|set_variable_SIN"] "NAV_MANI": ["f:sin(x*pi):|set_variable_SIN"],
"NAV_LFO": ["set_lfo_modulation_1_level"]
}, },
"control_change 50": { "control_change 50": {
"DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous","set_shader_speed_layer_1_amount"], "DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous","set_shader_speed_layer_1_amount"],
"NAV_DETOUR": ["set_detour_end_continuous"], "NAV_DETOUR": ["set_detour_end_continuous"],
"WJMXSEND": ["wj_set_colour_T_x"] "NAV_WJMX": ["wj_set_colour_T_x"],
"NAV_LFO": ["set_lfo_modulation_2_level"]
}, },
"control_change 51": { "control_change 51": {
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous","set_shader_speed_layer_2_amount"], "DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous","set_shader_speed_layer_2_amount"],
"NAV_DETOUR": ["set_detour_end_continuous"], "NAV_DETOUR": ["set_detour_end_continuous"],
"WJMXSEND": ["wj_set_colour_T_y"] "NAV_WJMX": ["wj_set_colour_T_y"],
"NAV_LFO": ["set_lfo_modulation_3_level"]
}, },
"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"],
"WJMXSEND": ["wj_set_mix","wj_send_append_pad_2_VCG:T"] "NAV_WJMX": ["wj_set_mix","wj_send_append_pad_2_VCG:T"]
}, },
"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"],
"NAV_DETOUR": ["set_detour_start_continuous"], "NAV_DETOUR": ["set_detour_start_continuous"],
"WJMXSEND": ["wj_set_back_colour_x","wj_set_back_wash_colour_x"] "NAV_WJMX": ["wj_set_back_colour_x","wj_set_back_wash_colour_x"]
}, },
"control_change 54": { "control_change 54": {
"DEFAULT": ["set_the_shader_param_2_layer_offset_1_continuous","set_param_2_layer_offset_0_modulation_level_continuous"], "DEFAULT": ["set_the_shader_param_2_layer_offset_1_continuous","set_param_2_layer_offset_0_modulation_level_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"], "NAV_DETOUR": ["set_detour_end_continuous"],
"WJMXSEND": ["wj_set_back_colour_y","wj_set_back_wash_colour_y"] "NAV_WJMX": ["wj_set_back_colour_y","wj_set_back_wash_colour_y"]
}, },
"control_change 55": { "control_change 55": {
"DEFAULT": ["set_the_shader_param_3_layer_offset_1_continuous","set_param_3_layer_offset_0_modulation_level_continuous"], "DEFAULT": ["set_the_shader_param_3_layer_offset_1_continuous","set_param_3_layer_offset_0_modulation_level_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"], "NAV_DETOUR": ["set_detour_end_continuous"],
"WJMXSEND": ["wj_set_back_colour_z","wj_set_back_wash_colour_z"] "NAV_WJMX": ["wj_set_back_colour_z","wj_set_back_wash_colour_z"]
}, },
"control_change 56": { "control_change 56": {
"DEFAULT": ["set_the_shader_param_0_layer_offset_2_continuous"], "DEFAULT": ["set_the_shader_param_0_layer_offset_2_continuous"],

1
plugins/LFOModulation.py
View File

@@ -1,6 +1,5 @@
import data_centre.plugin_collection import data_centre.plugin_collection
from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin
from plugins.frame_manager import Frame
class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin): class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
disabled = False disabled = False

2
plugins/ShaderLoopRecordPlugin.py
View File

@@ -46,7 +46,7 @@ class ShaderLoopRecordPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
self.pc.update_json(self.PRESET_FILE_NAME, self.frames) self.pc.update_json(self.PRESET_FILE_NAME, self.frames)
def get_display_modes(self): def get_display_modes(self):
return ['LOOPREC','NAV_LP'] return ['LOOPREC','NAV_LPRC']
def show_plugin(self, display, display_mode): def show_plugin(self, display, display_mode):
from tkinter import Text, END from tkinter import Text, END

12
user_input/midi_input.py
View File

@@ -114,16 +114,8 @@ class MidiInput(object):
def run_action_for_mapped_message(self, message_name, mapped_message_value): def run_action_for_mapped_message(self, message_name, mapped_message_value):
this_mapping = self.midi_mappings[message_name] this_mapping = self.midi_mappings[message_name]
#if self.data.function_on and "FN_%s"%self.data.control_mode in this_mapping:
# mode = "FN_%s"%self.data.control_mode
#el
#print ("got mapping %s" % this_mapping)
if self.data.control_mode in this_mapping: if self.data.control_mode in this_mapping:
mode = self.data.control_mode mode = self.data.control_mode
elif self.data.display_mode in this_mapping:
mode = self.data.display_mode
#elif self.data.function_on and "FN_DEFAULT" in this_mapping:
# mode = "FN_DEFAULT"
elif 'DEFAULT' in this_mapping: elif 'DEFAULT' in this_mapping:
mode = 'DEFAULT' mode = 'DEFAULT'
@@ -133,8 +125,8 @@ class MidiInput(object):
else: else:
method_name = this_mapping[mode][0] method_name = this_mapping[mode][0]
print('[][][][][ in mode {}, the action being called is {} from message_name {} in control_mode {}' #print('[][][][][ in mode {}, the action being called is {} from message_name {} in control_mode {}'
.format(mode, method_name, message_name, self.data.control_mode)) # .format(mode, method_name, message_name, self.data.control_mode))
if mapped_message_value is not None: if mapped_message_value is not None:
norm_message_value = mapped_message_value/127 norm_message_value = mapped_message_value/127

6
user_input/numpad_input.py
View File

@@ -43,12 +43,14 @@ class NumpadInput(object):
if self.data.function_on and len(this_mapping[mode]) > 1: if self.data.function_on and len(this_mapping[mode]) > 1:
print('the action being called is {}'.format(this_mapping[mode][1])) print('the action being called is {}'.format(this_mapping[mode][1]))
getattr(self.actions, this_mapping[mode][1])() #getattr(self.actions, this_mapping[mode][1])()
self.actions.call_method_name(this_mapping[mode][1])
if self.data.settings['sampler']['FUNC_GATED']['value'] == 'off': if self.data.settings['sampler']['FUNC_GATED']['value'] == 'off':
self.data.function_on = False self.data.function_on = False
else: else:
print('the action being called is {}'.format(this_mapping[mode][0])) print('the action being called is {}'.format(this_mapping[mode][0]))
getattr(self.actions, this_mapping[mode][0])() #getattr(self.actions, this_mapping[mode][0])()
self.actions.call_method_name(this_mapping[mode][0])
self.display.refresh_display() self.display.refresh_display()