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

wip new shader banks feature

Browse Source
This commit is contained in:
langolierz
2019-11-29 10:50:30 +00:00
parent c90ddeb703
commit b7e0919277
7 changed files with 389 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
json_objects/keypad_action_mapping.json
View File

@@ -6,7 +6,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"]
},
"b": {
"NAV_BROWSER": ["move_browser_selection_down"],
@@ -15,13 +16,15 @@
"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"]
},
"c": {
"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"],
@@ -34,11 +37,13 @@
"e": {
"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"]
},
"f": {
"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"]
},
"g": {
@@ -51,36 +56,47 @@
},
"j": {
"DEFAULT": ["load_slot_0_into_next_player","previous_bank"],
"PLAY_SHADER": ["play_shader_0","previous_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_0", "set_the_detour_mix_0"]
},
"k": {
"DEFAULT": ["load_slot_1_into_next_player","next_bank"],
"PLAY_SHADER": ["play_shader_1","next_shader_layer"],
"NAV_DETOUR": ["switch_to_detour_1", "set_the_detour_mix_1"]
},
"l": {
"DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"],
"PLAY_SHADER": ["play_shader_2","clear_shader_bank"],
"NAV_DETOUR": ["switch_to_detour_2", "clear_this_detour"]
},
"m": {
"DEFAULT": ["load_slot_3_into_next_player"],
"PLAY_SHADER": ["play_shader_3"],
"NAV_DETOUR": ["switch_to_detour_3"]
},
"n": {
"DEFAULT": ["load_slot_4_into_next_player"]
"DEFAULT": ["load_slot_4_into_next_player"],
"PLAY_SHADER": ["play_shader_4"]
},
"o": {
"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"]
},
"p": {
"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"]
},
"q": {
"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"]
},
"r": {
"DEFAULT": ["load_slot_8_into_next_player"]
"DEFAULT": ["load_slot_8_into_next_player"],
"PLAY_SHADER": ["play_shader_8"]
},
"s": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"]
}
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"],
"PLAY_SHADER":
["play_shader_9","confirm_shutdown"]
}
}

8
json_objects/settings_default.json
View File

@@ -170,6 +170,14 @@
],
"value": "enabled"
},
"USE_SHADER_BANK": {
"action": "update_capture_settings",
"options": [
"enabled",
"disabled"
],
"value": "disabled"
},
"X3_AS_SPEED": {
"action": null,
"options": [

188
json_objects/shader_bank_data.json Normal file
View File

@@ -0,0 +1,188 @@
[
[
{
"name": "wipe.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/wipe.frag",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
}
],
[
{
"name": "add_mix.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/add_mix.frag",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
}
],
[
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
},
{
"name": "",
"param_number": 4,
"path": "",
"shad_type": "-"
}
]
]