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

adding to osc support

Browse Source
This commit is contained in:
langolierz
2020-01-05 12:25:02 +00:00
parent 0acec6651a
commit 347e4fd4f3
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
json_objects/osc_action_mapping.json
View File

@@ -1,4 +1,20 @@
{ {
"/shaderparam0": {
"DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_mix_continuous"]
},
"/shaderparam1": {
"DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_speed_position_continuous"]
},
"/shaderparam2": {
"DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_start_continuous"]
},
"/shaderparam3": {
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous"],
"NAV_DETOUR": ["set_detour_end_continuous"]
},
"a": { "a": {
"NAV_BROWSER": ["move_browser_selection_up"], "NAV_BROWSER": ["move_browser_selection_up"],
"DEFAULT": ["seek_back_on_player", "decrease_seek_time"], "DEFAULT": ["seek_back_on_player", "decrease_seek_time"],

32
user_input/osc_input.py
View File

@@ -27,7 +27,11 @@ class OscInput(object):
server_args = server_parser.parse_args() server_args = server_parser.parse_args()
this_dispatcher = dispatcher.Dispatcher() this_dispatcher = dispatcher.Dispatcher()
this_dispatcher.map("/recurOsc", self.on_osc_input) this_dispatcher.map("/keyboard/*", self.on_osc_input)
this_dispatcher.map("/shaderparam0", self.on_param_osc_input)
this_dispatcher.map("/shaderparam1", self.on_param_osc_input)
this_dispatcher.map("/shaderparam2", self.on_param_osc_input)
this_dispatcher.map("/shaderparam3", self.on_param_osc_input)
this_dispatcher.map("/shutdown", self.exit_osc_server) this_dispatcher.map("/shutdown", self.exit_osc_server)
server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher) server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher)
@@ -38,16 +42,26 @@ class OscInput(object):
def exit_osc_server(self, unused_addr, args): def exit_osc_server(self, unused_addr, args):
self.osc_server.shutdown() self.osc_server.shutdown()
def on_osc_input(self, unused_addr, args): def on_osc_input(self, addr, args):
args = str(args)
print("!!!!!!!!!!!!!!!!" + args) print("!!!!!!!!!!!!!!!!" + args)
print("the address", addr)
key = addr[-1]
numpad = list(string.ascii_lowercase[0:19]) numpad = list(string.ascii_lowercase[0:19])
if args in numpad: if key in numpad:
self.run_action_for_osc_channel(args) self.run_action_for_osc_channel(key)
else: else:
print('{} is not in keypad map'.format(args)) print('{} is not in keypad map'.format(args))
def run_action_for_osc_channel(self, channel): def on_param_osc_input(self, addr, args):
print("the address", addr)
self.run_action_for_osc_channel(addr, param_value=args)
def run_action_for_osc_channel(self, channel, param_value=None):
this_mapping = self.osc_mappings[channel] this_mapping = self.osc_mappings[channel]
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
@@ -61,7 +75,13 @@ class OscInput(object):
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])()
if param_value is not None:
getattr(self.actions, this_mapping[mode][0])(param_value)
else:
getattr(self.actions, this_mapping[mode][0])()
self.display.refresh_display() self.display.refresh_display()