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

Revert the shader bank page to its previous configuration and add the modulation matrix page as a separate MOD_BANK

Browse Source
This commit is contained in:
Tristan Rowley
2020-03-07 17:07:32 +00:00
parent c9ac1bdfc4
commit 6bc4ce92d7
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data_centre/data.py
View File

@@ -467,6 +467,7 @@ class Data(object):
display_modes.append(["SHADERS",'NAV_SHADERS'])
if self.settings['shader']['USE_SHADER_BANK']['value'] == 'enabled' and ["SHADERS",'NAV_SHADERS'] in display_modes:
display_modes.append(["SHDR_BNK",'PLAY_SHADER'])
display_modes.append(["MOD_BNK","NAV_SHADERS"])
if self.settings['detour']['TRY_DEMO']['value'] == 'enabled':
display_modes.append(["FRAMES",'NAV_DETOUR'])
if self.settings['system'].setdefault('USE_PLUGINS',

33
display_centre/display.py
View File

@@ -91,6 +91,8 @@ class Display(object):
self._load_shaders()
elif self.data.display_mode == 'SHDR_BNK':
self._load_shader_bank()
elif self.data.display_mode == 'MOD_BNK':
self._load_modulation_bank()
elif self.data.display_mode == 'FRAMES':
self._load_detour()
elif self.data.display_mode == 'PLUGINS':
@@ -252,6 +254,37 @@ class Display(object):
self.display_text.insert(END, 'x{}:{:02d}'.format(i, display_param))
self.display_text.insert(END, '\n')
for index, slot in enumerate(shader_bank_data):
name_without_extension = slot['name'].rsplit('.',1)[0]
self.display_text.insert(END, '{:^6} {:<17} {:<5} \n'.format(index, name_without_extension[0:17], slot['shad_type']))
if index % 2:
self.display_text.tag_add("ZEBRA_STRIPE", self.ROW_OFFSET + index,
self.ROW_OFFSET + self.SELECTOR_WIDTH + index)
# highlight the slot of the selected player
current_slot = self.shaders.selected_shader_list[self.data.shader_layer].get('slot', None)
not_playing_tag = self.shaders.selected_status_list[self.data.shader_layer] != '▶'
if current_slot is not None:
self._highlight_this_row(current_slot, gray=not_playing_tag)
self._highlight_this_param(self.shaders.focused_param)
def _load_modulation_bank(self):
shader_bank_data = self.data.shader_bank_data[self.data.shader_layer]
self.display_text.insert(END, '{} \n'.format(self.body_title))
self.display_text.insert(END, '{:>6} {:<11} {:<5} '.format(
'{}-layer'.format(self.data.shader_layer), 'name', 'type'))
shader = self.shaders.selected_shader_list[self.data.shader_layer]
for i in range(min(4,shader['param_number'])):
display_param = self.format_param_value(self.shaders.selected_param_list[self.data.shader_layer][i])
if display_param == 100:
display_param == 99
self.display_text.insert(END, 'x{}:{:02d}'.format(i, display_param))
self.display_text.insert(END, '\n')
for index, slot in enumerate(shader_bank_data):
name_without_extension = slot['name'].rsplit('.',1)[0]
#self.display_text.insert(END, '{:^6} {:<17} {:<5} '.format(index, name_without_extension[0:17], slot['shad_type']))