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 'feature_plugins' into feature_plugins_shader_gadgets

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-16 21:39:32 +00:00
parent 2b6d9fe409 9180bff0fb
commit 29fe0f16c9
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data_centre/plugin_collection.py
View File

@@ -49,7 +49,11 @@ class SequencePlugin(Plugin):
] ]
def set_speed(self, speed): def set_speed(self, speed):
self.speed = 2.0 * (2.0*(speed-0.5)) #self.speed = 2.0 * (2.0*(speed-0.5))
speed = 2.0*(speed-0.5) # adjust to range -1 to +1
negative = speed<0.0 # remember negative state cos we'll lose it in next
self.speed = (speed * speed) * 2.0
if negative: self.speed *= -1
print ("automation speed is now %s" % self.speed) print ("automation speed is now %s" % self.speed)
"""def position(self, now): """def position(self, now):

6
plugins/WJSendPlugin.py
View File

@@ -72,15 +72,15 @@ class WJSendPlugin(ActionsPlugin, SequencePlugin, DisplayPlugin, ModulationRecei
return diff return diff
def merge_data(self, data1, data2): def merge_data(self, data1, data2):
print (">>>merge_data passed\n\t%s\nand\n\t%s" % (data1,data2)) #print (">>>merge_data passed\n\t%s\nand\n\t%s" % (data1,data2))
output = {} output = {}
if data1 is None: if data1 is None:
output = data2.copy() output = data2.copy()
else: else:
output = data1.copy() output = data1.copy()
output.update(data2) output.update(data2)
print("merge_data returning\n\t%s" % output) #print("merge_data returning\n\t%s" % output)
print("<<<<<<") #print("<<<<<<")
return output return output
def recall_frame_data(self, data): def recall_frame_data(self, data):