Merge branch 'interactions' of https://code.studioinfinity.org/glen/FireStar into interactions

This commit is contained in:
Aaron Fenyes 2019-09-28 23:41:31 +02:00
commit 9973abad78

View File

@ -76,9 +76,9 @@ fullsat = 254
def set_light_hsv(e, color, hit_bridge): def set_light_hsv(e, color, hit_bridge):
command = { command = {
'hue' : color[0]*lasthue, 'hue' : int(color[0]*lasthue),
'bri' : color[2]*fullbright, 'bri' : int(color[2]*fullbright),
'sat' : color[1]*fullsat 'sat' : int(color[1]*fullsat)
} }
if hit_bridge and b != None: if hit_bridge and b != None:
b.set_light(edges[e].light_id, command) b.set_light(edges[e].light_id, command)
@ -87,7 +87,7 @@ def set_light_hsv(e, color, hit_bridge):
# === interaction parameters === # === interaction parameters ===
frame_rate = 24 frame_rate = 2
inductance = 0.001 inductance = 0.001