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

Merge branch 'dev' into feature_plugins

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-29 14:31:33 +00:00
parent a8fe735478 638a78ab68
commit c712b762d0
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
actions.py
View File

@@ -728,6 +728,7 @@ class Actions(object):
def quit_the_program(self):
self.data._update_json(self.data.SETTINGS_JSON, self.data.settings)
self.video_driver.exit_all_players()
self.exit_openframeworks()
self.exit_osc_server('','')

15
video_centre/shaders.py
View File

@@ -24,11 +24,16 @@ class Shaders(object):
self.selected_speed_list = [1.0, 1.0, 1.0]
self.selected_modulation_slot = 0
self.selected_modulation_level = [[[0.0,0.0,0.0,0.0] for i in range(4)] for i in range(3)]
#self.modulation_level = [[[0.0,0.0,0.0,0.0] for i in range(4)] for i in range(3)]
self.modulation_value = [0.0,0.0,0.0,0.0]
#self.load_selected_shader()
@property
def modulation_level(self):
return self.data.settings['shader'].setdefault('modulation_level',
[[[0.0,0.0,0.0,0.0] for i in range(4)] for i in range(3)])
def generate_shaders_list(self):
shaders_menu_list = []
raw_list = self.shaders_menu.generate_raw_shaders_list()
@@ -170,7 +175,7 @@ class Shaders(object):
self.selected_modulation_slot = slot
def reset_modulation(self, slot):
for layer in self.selected_modulation_level:
for layer in self.modulation_level:
for layer,levels in enumerate(layer):
levels[slot] = 0.0
@@ -234,7 +239,7 @@ class Shaders(object):
plugin.set_modulation_value(param, self.modulation_value[param])
for layer,params in enumerate(self.selected_param_list):
for ip,p in enumerate(params):
for p2,v in enumerate(self.selected_modulation_level[layer][ip]):
for p2,v in enumerate(self.modulation_level[layer][ip]):
if v!=0:
self.update_param_layer(ip,layer)
break
@@ -244,7 +249,7 @@ class Shaders(object):
self.set_param_layer_modulation_level(param, layer, level)
def set_param_layer_modulation_level(self, param, layer, level):
self.selected_modulation_level[layer][param][self.selected_modulation_slot] = level
self.modulation_level[layer][param][self.selected_modulation_slot] = level
self.update_param_layer(param, layer)
def update_param_layer(self, param, layer):
@@ -254,7 +259,7 @@ class Shaders(object):
self.get_modulation_value_list(
self.selected_param_list[layer][param],
self.modulation_value,#[0], #param],
self.selected_modulation_level[layer][param]
self.modulation_level[layer][param]
)
)