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

some fixes for recording automation sources

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-16 19:42:13 +00:00
parent 2acabf6e37
commit 1c1bb4309b
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ShaderLoopRecordPlugin.py
View File

@@ -207,10 +207,14 @@ class ShaderLoopRecordPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
if self.DEBUG_FRAMES: print("saved frame is \t%s" % saved_frame['shader_params']) if self.DEBUG_FRAMES: print("saved frame is \t%s" % saved_frame['shader_params'])
self.ignored = self.pc.fm.merge_frames(self.ignored, diff) self.ignored = self.pc.fm.merge_frames(self.ignored, diff)
if self.DEBUG_FRAMES: print("about to call get_ignored_frames with %s\n and\n %s" % (saved_frame.f, self.ignored.f)) if self.DEBUG_FRAMES: print("about to call get_ignored_frames with %s\n and\n %s" % (saved_frame.f, self.ignored.f))
"""print("got self.ignored:\n\t%s\n" % self.ignored.f)
print("diff is currently:\n\t%s\n" % diff.f)
print("saved_frame is currently:\n\t%s\n" % saved_frame.f)"""
diff = self.pc.fm.merge_frames( diff = self.pc.fm.merge_frames(
self.pc.fm.get_frame_ignored(saved_frame, self.ignored), self.pc.fm.get_frame_ignored(saved_frame, self.ignored),
diff diff
) )
#print("got merged:\n\t%s\n" % diff.f)
#diff = self.pc.shaders.merge_frames(self.pc.shaders.get_live_frame(), diff) #diff = self.pc.shaders.merge_frames(self.pc.shaders.get_live_frame(), diff)
self.pc.fm.recall_frame(diff) self.pc.fm.recall_frame(diff)
if self.DEBUG_FRAMES: print("after diff2 is: \t%s" % diff['shader_params']) if self.DEBUG_FRAMES: print("after diff2 is: \t%s" % diff['shader_params'])

19
plugins/frame_manager.py
View File

@@ -87,7 +87,7 @@ class Frame:
from data_centre.plugin_collection import AutomationSourcePlugin from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin): for plugin in self.pc.get_plugins(AutomationSourcePlugin):
#print("recalling for plugin %s with data %s" % (plugin, self.f.get(plugin.frame_key))) print("recalling for plugin %s with data %s" % (plugin, self.f.get(plugin.frame_key)))
plugin.recall_frame_data(self.f.get(plugin.frame_key)) plugin.recall_frame_data(self.f.get(plugin.frame_key))
def recall_frame(self): def recall_frame(self):
@@ -145,7 +145,7 @@ class Frame:
# todo: merge from plugins # todo: merge from plugins
from data_centre.plugin_collection import AutomationSourcePlugin from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin): for plugin in self.pc.get_plugins(AutomationSourcePlugin):
f[plugin.frame_key] = frame2.f.get(plugin.frame_key) f[plugin.frame_key] = plugin.merge_data(f.get(plugin.frame_key),frame2.f.get(plugin.frame_key))
if self.DEBUG_FRAMES: print("merge_frames: got return\t%s" % f) if self.DEBUG_FRAMES: print("merge_frames: got return\t%s" % f)
return Frame(self.pc).store_copy(f) return Frame(self.pc).store_copy(f)
@@ -170,10 +170,19 @@ class Frame:
f['shader_speeds'][i] = None f['shader_speeds'][i] = None
if ignored.get('strobe_amount') is not None: if ignored.get('strobe_amount') is not None:
f['strobe_amount'] = None f['strobe_amount'] = None
if self.DEBUG_FRAMES: print("get_frame_ignored: got return\t%s" % f)
# todo: find ignored from plugin # todo: find ignored from plugin
from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin):
if ignored.get(plugin.frame_key) is not None:
#print("ignoring for %s:\n\t%s\n" % (plugin.frame_key, ignored.get(plugin.frame_key)))
# TODO: move this into the plugin so plugin can handle its own data
for queue,item in frame.get(plugin.frame_key,{}).items():
if ignored.get(plugin.frame_key).get(queue) is not None:
#print ("\tfound that should ignore %s (%s) ?" % (queue, item))
f[plugin.frame_key][queue] = None
if self.DEBUG_FRAMES: print("get_frame_ignored: got return\t%s" % f)
return Frame(self.pc).store_copy(f) return Frame(self.pc).store_copy(f)
def is_empty(self): def is_empty(self):
@@ -204,7 +213,8 @@ class Frame:
for plugin in self.pc.get_plugins(AutomationSourcePlugin): for plugin in self.pc.get_plugins(AutomationSourcePlugin):
if frame.get(plugin.frame_key) is None: if frame.get(plugin.frame_key) is None:
continue continue
if len(frame.get(plugin.frame_key))>1: # TODO: move this into the plugin so that it can handle what it does
if len(frame.get(plugin.frame_key))>0:
return False return False
if self.DEBUG_FRAMES: print("is_frame_empty: got return true") if self.DEBUG_FRAMES: print("is_frame_empty: got return true")
@@ -312,6 +322,7 @@ class FrameManager:
from data_centre.plugin_collection import AutomationSourcePlugin from data_centre.plugin_collection import AutomationSourcePlugin
for plugin in self.pc.get_plugins(AutomationSourcePlugin): for plugin in self.pc.get_plugins(AutomationSourcePlugin):
data[plugin.frame_key] = plugin.get_frame_data() data[plugin.frame_key] = plugin.get_frame_data()
#plugin.clear_recorded_frame()
#print("get_plugin_frame_data looks like %s" % data) #print("get_plugin_frame_data looks like %s" % data)
return data return data