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-05 16:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

some fine tune shaders

Browse Source
This commit is contained in:
langolierz
2019-12-03 20:42:03 +00:00
parent 2e133df8c3
commit 0d32e5aa1a
7 changed files with 201 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
json_objects/midi_action_mapping.json
View File

@@ -49,7 +49,8 @@
"NAV_SHADERS": ["move_shaders_selection_up"],
"LENGTH_SET": ["return_to_default_control_mode"],
"CONFIRM": ["return_to_default_control_mode"],
"SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"]
"SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"],
"PLAY_SHADER": ["decrease_this_param", "decrease_shader_param"]
},
"note_on 73": {
"NAV_BROWSER": ["move_browser_selection_down"],
@@ -58,17 +59,20 @@
"NAV_SHADERS": ["move_shaders_selection_down"],
"LENGTH_SET": ["return_to_default_control_mode"],
"CONFIRM": ["return_to_default_control_mode"],
"SHADER_PARAM": ["increase_this_param", "increase_shader_param"]
"SHADER_PARAM": ["increase_this_param", "increase_shader_param"],
"PLAY_SHADER": ["increase_this_param", "increase_shader_param"]
},
"note_on 74": {
"NAV_BROWSER": ["enter_on_browser_selection"],
"DEFAULT": ["toggle_action_on_player","toggle_show_on_player"],
"NAV_SETTINGS": ["enter_on_settings_selection"],
"NAV_SHADERS": ["enter_on_shaders_selection"],
"NAV_SHADERS": ["enter_on_shaders_selection", "map_on_shaders_selection"],
"LENGTH_SET": ["record_fixed_length"],
"SHADER_PARAM": ["return_to_default_control_mode"],
"CONFIRM": ["perform_confirm_action"],
"NAV_DETOUR": ["toggle_detour_play"]
"NAV_DETOUR": ["toggle_detour_play"],
"PLAY_SHADER": ["toggle_shaders", "toggle_shader_speed"]
},
"note_on 75": {
"DEFAULT": ["switch_to_next_player", "toggle_player_mode"],
@@ -77,11 +81,13 @@
"note_on 76": {
"DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"],
"SHADER_PARAM": ["decrease_param_focus"],
"PLAY_SHADER": ["decrease_param_focus"],
"NAV_DETOUR": ["decrease_mix_shader"]
},
"note_on 77": {
"DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"],
"SHADER_PARAM": ["increase_param_focus"],
"PLAY_SHADER": ["increase_param_focus"],
"NAV_DETOUR": ["increase_mix_shader"]
},
"note_on 78": {
@@ -94,46 +100,60 @@
},
"note_on 81": {
"DEFAULT": ["load_slot_0_into_next_player","previous_bank"],
"PLAY_SHADER": ["play_shader_0","previous_shader_layer"],
"NAV_SHADERS": ["play_shader_0","previous_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_0", "set_the_detour_mix_0"]
},
"note_on 82": {
"DEFAULT": ["load_slot_1_into_next_player","next_bank"],
"PLAY_SHADER": ["play_shader_1","next_shader_layer"],
"NAV_SHADERS": ["play_shader_1","next_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_1", "set_the_detour_mix_1"]
},
"note_on 83": {
"DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"],
"PLAY_SHADER": ["play_shader_2","clear_shader_bank"],
"NAV_SHADERS": ["play_shader_2","clear_shader_bank"],
"NAV_DETOUR": ["switch_to_detour_2", "clear_this_detour"]
},
"note_on 84": {
"DEFAULT": ["load_slot_3_into_next_player"],
"PLAY_SHADER": ["play_shader_3"],
"NAV_DETOUR": ["switch_to_detour_3"]
},
"note_on 85": {
"DEFAULT": ["load_slot_4_into_next_player"]
"DEFAULT": ["load_slot_4_into_next_player"],
"PLAY_SHADER": ["play_shader_4"]
},
"note_on 86": {
"DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"]
"DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"],
"PLAY_SHADER": ["play_shader_5", "toggle_screen_mirror"]
},
"note_on 87": {
"DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"]
"DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"],
"PLAY_SHADER": ["play_shader_6","toggle_shaders"]
},
"note_on 88": {
"DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"]
"DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"],
"PLAY_SHADER": ["play_shader_7","toggle_detour_mode"]
},
"note_on 89": {
"DEFAULT": ["load_slot_8_into_next_player"]
"DEFAULT": ["load_slot_8_into_next_player", "toggle_feedback"],
"PLAY_SHADER": ["play_shader_8", "toggle_feedback"]
},
"note_on 90": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"]
},
"note_on 36": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"],
"PLAY_SHADER": ["play_shader_9","confirm_shutdown"]
},
"note_on 36": {
"NAV_BROWSER": ["move_browser_selection_up"],
"DEFAULT": ["seek_back_on_player", "decrease_seek_time"],
"NAV_SETTINGS": ["move_settings_selection_up"],
"NAV_SHADERS": ["move_shaders_selection_up"],
"LENGTH_SET": ["return_to_default_control_mode"],
"CONFIRM": ["return_to_default_control_mode"],
"SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"]
"SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"],
"PLAY_SHADER": ["decrease_this_param", "decrease_shader_param"]
},
"note_on 37": {
"NAV_BROWSER": ["move_browser_selection_down"],
@@ -142,17 +162,20 @@
"NAV_SHADERS": ["move_shaders_selection_down"],
"LENGTH_SET": ["return_to_default_control_mode"],
"CONFIRM": ["return_to_default_control_mode"],
"SHADER_PARAM": ["increase_this_param", "increase_shader_param"]
"SHADER_PARAM": ["increase_this_param", "increase_shader_param"],
"PLAY_SHADER": ["increase_this_param", "increase_shader_param"]
},
"note_on 38": {
"NAV_BROWSER": ["enter_on_browser_selection"],
"DEFAULT": ["toggle_action_on_player","toggle_show_on_player"],
"NAV_SETTINGS": ["enter_on_settings_selection"],
"NAV_SHADERS": ["enter_on_shaders_selection"],
"NAV_SHADERS": ["enter_on_shaders_selection", "map_on_shaders_selection"],
"LENGTH_SET": ["record_fixed_length"],
"SHADER_PARAM": ["return_to_default_control_mode"],
"CONFIRM": ["perform_confirm_action"],
"NAV_DETOUR": ["toggle_detour_play"]
"NAV_DETOUR": ["toggle_detour_play"],
"PLAY_SHADER": ["toggle_shaders", "toggle_shader_speed"]
},
"note_on 39": {
"DEFAULT": ["switch_to_next_player", "toggle_player_mode"],
@@ -161,54 +184,69 @@
"note_on 40": {
"DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"],
"SHADER_PARAM": ["decrease_param_focus"],
"PLAY_SHADER": ["decrease_param_focus"],
"NAV_DETOUR": ["decrease_mix_shader"]
},
"note_on 41": {
"DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"],
"SHADER_PARAM": ["increase_param_focus"],
"PLAY_SHADER": ["increase_param_focus"],
"NAV_DETOUR": ["increase_mix_shader"]
},
"note_on 42": {
"DEFAULT": ["toggle_capture_preview", "toggle_capture_recording"]},
"note_on 79": {
"note_on 43": {
"DEFAULT": ["cycle_display_mode", "cycle_display_mode_back"]
},
"note_on 43": {
"note_on 44": {
"DEFAULT": ["toggle_function"]
},
"note_on 44": {
"note_on 45": {
"DEFAULT": ["load_slot_0_into_next_player","previous_bank"],
"PLAY_SHADER": ["play_shader_0","previous_shader_layer"],
"NAV_SHADERS": ["play_shader_0","previous_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_0", "set_the_detour_mix_0"]
},
"note_on 45": {
"note_on 46": {
"DEFAULT": ["load_slot_1_into_next_player","next_bank"],
"PLAY_SHADER": ["play_shader_1","next_shader_layer"],
"NAV_SHADERS": ["play_shader_1","next_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_1", "set_the_detour_mix_1"]
},
"note_on 46": {
"note_on 47": {
"DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"],
"PLAY_SHADER": ["play_shader_2","clear_shader_bank"],
"NAV_SHADERS": ["play_shader_2","clear_shader_bank"],
"NAV_DETOUR": ["switch_to_detour_2", "clear_this_detour"]
},
"note_on 47": {
"note_on 48": {
"DEFAULT": ["load_slot_3_into_next_player"],
"PLAY_SHADER": ["play_shader_3"],
"NAV_DETOUR": ["switch_to_detour_3"]
},
"note_on 48": {
"DEFAULT": ["load_slot_4_into_next_player"]
},
"note_on 49": {
"DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"]
"DEFAULT": ["load_slot_4_into_next_player"],
"PLAY_SHADER": ["play_shader_4"]
},
"note_on 50": {
"DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"]
"DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"],
"PLAY_SHADER": ["play_shader_5", "toggle_screen_mirror"]
},
"note_on 51": {
"DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"]
"DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"],
"PLAY_SHADER": ["play_shader_6","toggle_shaders"]
},
"note_on 52": {
"DEFAULT": ["load_slot_8_into_next_player"]
"DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"],
"PLAY_SHADER": ["play_shader_7","toggle_detour_mode"]
},
"note_on 53": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"]
}
"DEFAULT": ["load_slot_8_into_next_player", "toggle_feedback"],
"PLAY_SHADER": ["play_shader_8", "toggle_feedback"]
},
"note_on 54": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"],
"PLAY_SHADER": ["play_shader_9","confirm_shutdown"]
}
}

17
json_objects/shader_bank_data.json
View File

@@ -69,13 +69,15 @@
"name": "hsv_control.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/hsv_control.frag",
"shad_type": "-"
"shad_type": "-",
"slot": 0
},
{
"name": "",
"name": "hsv_control_fine.frag",
"param_number": 4,
"path": "",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/hsv_control_fine.frag",
"shad_type": "-",
"slot": 1
},
{
"name": "",
@@ -131,8 +133,7 @@
"name": "wobble.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/wobble.frag",
"shad_type": "-",
"slot": 0
"shad_type": "-"
},
{
"name": "rotate.frag",
@@ -141,9 +142,9 @@
"shad_type": "-"
},
{
"name": "",
"name": "rotate_fine.frag",
"param_number": 4,
"path": "",
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/rotate_fine.frag",
"shad_type": "-"
},
{