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 03:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
langolierz
2020-01-05 12:25:33 +00:00
parent 347e4fd4f3 9935f1a98b
commit 0d746e6a70
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actions.py
View File

@@ -830,8 +830,9 @@ class Actions(object):
current_recur_hash = recur_repo.head.object.hexsha current_recur_hash = recur_repo.head.object.hexsha
current_conjur_hash = conjur_repo.head.object.hexsha current_conjur_hash = conjur_repo.head.object.hexsha
current_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha current_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha
os.remove('/home/pi/r_e_c_u_r/json_objects/settings.json')
os.remove(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) self.data.try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON )
self.data.try_remove_file(self.data.PATH_TO_DEFAULT_CONJUR_DATA)
try: try:
recur_repo.remotes.origin.pull() recur_repo.remotes.origin.pull()
conjur_repo.remotes.origin.pull() conjur_repo.remotes.origin.pull()
@@ -869,4 +870,3 @@ class Actions(object):

6
data_centre/data.py
View File

@@ -58,7 +58,7 @@ class Data(object):
### persisted data (use default if doesnt exits): ### persisted data (use default if doesnt exits):
if not os.path.isfile(self.PATH_TO_CONJUR_DATA): if not os.path.isfile(self.PATH_TO_CONJUR_DATA):
os.remove(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON ) # keep the, in sync self.try_remove_file(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON ) # keep the, in sync
copyfile(self.PATH_TO_DEFAULT_CONJUR_DATA, self.PATH_TO_CONJUR_DATA) copyfile(self.PATH_TO_DEFAULT_CONJUR_DATA, self.PATH_TO_CONJUR_DATA)
self.bank_data = [self.create_empty_bank()] self.bank_data = [self.create_empty_bank()]
@@ -407,3 +407,7 @@ class Data(object):
else: else:
return [] return []
@staticmethod
def try_remove_file(path):
if os.path.exists(path):
os.remove(path)

6
display_centre/menu.py
View File

@@ -79,7 +79,7 @@ class BrowserMenu(Menu):
root, dirs, files = next(os.walk(current_path)) root, dirs, files = next(os.walk(current_path))
indent = ' ' * 4 * (current_level) indent = ' ' * 4 * (current_level)
for folder in dirs: for folder in sorted(dirs):
is_open, char = self._check_folder_state(folder) is_open, char = self._check_folder_state(folder)
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x')) self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x'))
if (is_open): if (is_open):
@@ -87,6 +87,7 @@ class BrowserMenu(Menu):
next_level = current_level + 1 next_level = current_level + 1
self._add_folder_to_browser_list(next_path, next_level) self._add_folder_to_browser_list(next_path, next_level)
files.sort()
for f in files: for f in files:
split_name = os.path.splitext(f) split_name = os.path.splitext(f)
if (split_name[1].lower() in ['.mp4', '.mkv', '.avi', '.mov']): if (split_name[1].lower() in ['.mp4', '.mkv', '.avi', '.mov']):
@@ -202,7 +203,7 @@ class ShadersMenu(Menu):
root, dirs, files = next(os.walk(current_path)) root, dirs, files = next(os.walk(current_path))
indent = ' ' * 4 * (current_level) indent = ' ' * 4 * (current_level)
for folder in dirs: for folder in sorted(dirs):
is_open, char = self._check_folder_state(folder) is_open, char = self._check_folder_state(folder)
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False)) self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False))
if (is_open): if (is_open):
@@ -210,6 +211,7 @@ class ShadersMenu(Menu):
next_level = current_level + 1 next_level = current_level + 1
self._add_folder_to_shaders_list(next_path, next_level) self._add_folder_to_shaders_list(next_path, next_level)
files.sort()
for f in files: for f in files:
split_name = os.path.splitext(f) split_name = os.path.splitext(f)
if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']): if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']):

1
enclosure/README.md Normal file
View File

@@ -0,0 +1 @@
gonna explain a little about the enclosure options here :

6
video_centre/shaders.py
View File

@@ -155,15 +155,15 @@ class Shaders(object):
if layer_offset is None: if layer_offset is None:
start_layer = self.data.shader_layer start_layer = self.data.shader_layer
layer_offset = 0 layer_offset = 0
layer = start_layer + layer_offset % 4 layer = (start_layer + layer_offset) % 3
if self.data.settings['shader']['X3_AS_SPEED']['value'] == 'enabled' and param == 3: if self.data.settings['shader']['X3_AS_SPEED']['value'] == 'enabled' and param == 3:
self.set_speed_to_amount(amount, layout_offset=layout_offset) self.set_speed_to_amount(amount, layer_offset=layer_offset)
else: else:
self.osc_client.send_message("/shader/{}/param".format(str(layer)), [param, amount] ) self.osc_client.send_message("/shader/{}/param".format(str(layer)), [param, amount] )
self.selected_param_list[layer][param] = amount self.selected_param_list[layer][param] = amount
def set_speed_to_amount(self, amount, layer_offset=0): def set_speed_to_amount(self, amount, layer_offset=0):
layer = self.data.shader_layer + layer_offset % 4 layer = (self.data.shader_layer + layer_offset) % 3
self.osc_client.send_message("/shader/{}/speed".format(str(layer)), amount ) self.osc_client.send_message("/shader/{}/speed".format(str(layer)), amount )
self.selected_speed_list[layer] = amount self.selected_speed_list[layer] = amount