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

working on new shader bank feature

Browse Source
This commit is contained in:
langolierz
2019-12-03 17:31:28 +00:00
parent 9125bf11e1
commit 4313c4b060
9 changed files with 174 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
json_objects/analog_action_mapping.json
View File

@@ -1,34 +1,34 @@
{
"0": {
"DEFAULT": ["set_the_shader_param_0_continuous"],
"DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_mix_continuous"]
},
"1": {
"DEFAULT": ["set_the_shader_param_1_continuous"],
"DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"]
},
"2": {
"DEFAULT": ["set_the_shader_param_2_continuous"],
"DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_start_continuous"]
},
"3": {
"DEFAULT": ["set_the_shader_param_3_continuous"],
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"]
},
"4": {
"DEFAULT": ["set_the_shader_param_0_continuous"],
"DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_mix_continuous"]
},
"5": {
"DEFAULT": ["set_the_shader_param_1_continuous"],
"DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"]
},
"6": {
"DEFAULT": ["set_the_shader_param_2_continuous"],
"DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_start_continuous"]
},
"7": {
"DEFAULT": ["set_the_shader_param_3_continuous"],
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"]
}
}

17
json_objects/keypad_action_mapping.json
View File

@@ -28,7 +28,8 @@
"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"]
},
"d": {
"DEFAULT": ["switch_to_next_player", "toggle_player_mode"],
@@ -57,16 +58,19 @@
"j": {
"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"]
},
"k": {
"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"]
},
"l": {
"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"]
},
"m": {
@@ -80,7 +84,7 @@
},
"o": {
"DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"],
"PLAY_SHADER": ["play_shader_5"]
"PLAY_SHADER": ["play_shader_5", "toggle_screen_mirror"]
},
"p": {
"DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"],
@@ -91,12 +95,11 @@
"PLAY_SHADER": ["play_shader_7","toggle_detour_mode"]
},
"r": {
"DEFAULT": ["load_slot_8_into_next_player"],
"PLAY_SHADER": ["play_shader_8"]
"DEFAULT": ["load_slot_8_into_next_player", "toggle_feedback"],
"PLAY_SHADER": ["play_shader_8", "toggle_feedback"]
},
"s": {
"DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"],
"PLAY_SHADER":
["play_shader_9","confirm_shutdown"]
}
"PLAY_SHADER": ["play_shader_9","confirm_shutdown"]
}
}

24
json_objects/midi_action_mapping.json
View File

@@ -1,43 +1,43 @@
{
"control_change 0": {
"DEFAULT": ["set_the_shader_param_0_continuous"],
"DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_mix_continuous"]
},
"control_change 1": {
"DEFAULT": ["set_the_shader_param_1_continuous"],
"DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"]
},
"control_change 2": {
"DEFAULT": ["set_the_shader_param_2_continuous"],
"DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_start_continuous"]
},
"control_change 3": {
"DEFAULT": ["set_the_shader_param_3_continuous"],
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"]
},
"control_change 4": {
"DEFAULT": ["set_the_shader_param_0_continuous"]
"DEFAULT": ["set_the_shader_param_0_layer_offset_1_continuous"]
},
"control_change 5": {
"DEFAULT": ["set_the_shader_param_1_continuous"]
"DEFAULT": ["set_the_shader_param_1_layer_offset_1_continuous"]
},
"control_change 6": {
"DEFAULT": ["set_the_shader_param_2_continuous"]
"DEFAULT": ["set_the_shader_param_2_layer_offset_1_continuous"]
},
"control_change 7": {
"DEFAULT": ["set_the_shader_param_3_continuous"]
"DEFAULT": ["set_the_shader_param_3_layer_offset_1_continuous"]
},
"control_change 8": {
"DEFAULT": ["set_the_shader_param_0_continuous"]
"DEFAULT": ["set_the_shader_param_0_layer_offset_2_continuous"]
},
"control_change 9": {
"DEFAULT": ["set_the_shader_param_1_continuous"]
"DEFAULT": ["set_the_shader_param_1_layer_offset_2_continuous"]
},
"control_change 10": {
"DEFAULT": ["set_the_shader_param_2_continuous"]
"DEFAULT": ["set_the_shader_param_2_layer_offset_2_continuous"]
},
"control_change 11": {
"DEFAULT": ["set_the_shader_param_3_continuous"]
"DEFAULT": ["set_the_shader_param_0_layer_offset_3_continuous"]
},
"note_on 72": {
"NAV_BROWSER": ["move_browser_selection_up"],

13
json_objects/settings_default.json
View File

@@ -163,7 +163,7 @@
},
"shader": {
"USE_SHADER": {
"action": "update_capture_settings",
"action": null,
"options": [
"enabled",
"disabled"
@@ -171,7 +171,15 @@
"value": "enabled"
},
"USE_SHADER_BANK": {
"action": "update_capture_settings",
"action": null,
"options": [
"enabled",
"disabled"
],
"value": "disabled"
},
"FIX_PARAM_OFFSET_LAYER": {
"action": null,
"options": [
"enabled",
"disabled"
@@ -375,6 +383,7 @@
"options": [
"preferred",
"CEA 4 HDMI",
"CEA 1 HDMI",
"CEA 17 HDMI"
],
"value": "CEA 4 HDMI"

42
json_objects/shader_bank_data.json
View File

@@ -1,22 +1,25 @@
[
[
{
"name": "wipe.frag",
"name": "add_mix.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/wipe.frag",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/add_mix.frag",
"shad_type": "-",
"slot": 0
},
{
"name": "",
"name": "luma_key.frag",
"param_number": 4,
"path": "",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/luma_key.frag",
"shad_type": "-",
"slot": 1
},
{
"name": "",
"name": "blend_add.frag",
"param_number": 4,
"path": "",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/blend_add.frag",
"shad_type": "-",
"slot": 2
},
{
"name": "",
@@ -66,13 +69,15 @@
"name": "add_mix.frag",
"param_number": 4,
"path": "/home/pi/r_e_c_u_r/Shaders/2-input/add_mix.frag",
"shad_type": "-"
"shad_type": "-",
"slot": 0
},
{
"name": "",
"name": "hsv_control.frag",
"param_number": 4,
"path": "",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/hsv_control.frag",
"shad_type": "-",
"slot": 1
},
{
"name": "",
@@ -125,15 +130,16 @@
],
[
{
"name": "",
"name": "wobble.frag",
"param_number": 4,
"path": "",
"shad_type": "-"
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/wobble.frag",
"shad_type": "-",
"slot": 0
},
{
"name": "",
"name": "rotate.frag",
"param_number": 4,
"path": "",
"path": "/home/pi/r_e_c_u_r/Shaders/1-input/rotate.frag",
"shad_type": "-"
},
{