From 0ac76265a083ee167e1e6b69eb031feacf7f25a6 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sun, 29 Sep 2019 01:23:02 +0200 Subject: [PATCH 1/3] Start developing heat evolution --- interactions.py | 89 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/interactions.py b/interactions.py index 71c63b7..073dce1 100644 --- a/interactions.py +++ b/interactions.py @@ -55,8 +55,8 @@ clock = pygame.time.Clock() # --- copied from firestar.py -b = phue.Bridge('172.18.130.12') -##b = None +##b = phue.Bridge('172.18.130.12') +b = None Nedges = 30; edgecode = [None] * Nedges; @@ -87,17 +87,22 @@ def set_light_hsv(e, color, hit_bridge): # === interaction parameters === -frame_rate = 2 +frame_rate = 24 inductance = 0.001 -therm_conduct = 0.001 +therm_conduct = 0.01 drain = False drain_rate = 0.1 # === phase space === +# heat equation +temp = 30*[0] +new_temp = 30*[0] + +# wave equation charge = 12*[0] current = 30*[0] @@ -108,11 +113,13 @@ change_threshold = 0.05 def heat_evolution(): for e, f in cyc_edge_adj: - flow = therm_conduct*(current[e] - current[f]) - current[e] -= flow - current[f] += flow + flow = therm_conduct*(temp[e] - temp[f]) + new_temp[e] -= flow + new_temp[f] += flow + for e in range(30): if drain: - current[v] *= 1 - drain_rate + new_temp[e] *= 1 - drain_rate + temp[e] = max(new_temp[e], 0) def wave_evolution(): # use verlet integration, first updating the currents and then using the new @@ -128,6 +135,15 @@ def wave_evolution(): for v in range(12): charge[v] *= 1 - drain_rate +def set_heat_light(e, i): + litness = 1 - exp(-2*i) + if abs(litness - last_litness[e]) > change_threshold: + hit_bridge = True + last_litness[e] = litness + else: + hit_bridge = False + set_light_hsv(e, (0.167*last_litness[e], 1 - 0.5*last_litness[e]*last_litness[e], last_litness[e]), hit_bridge) + def set_wave_light(e, i): litness = 1 - exp(-2*i*i) hit_bridge = abs(litness - last_litness[e]) > change_threshold @@ -135,6 +151,38 @@ def set_wave_light(e, i): if hit_bridge: last_litness[e] = litness +def handle_heat_events(): + global drain + for event in pygame.event.get(): + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_j: + new_temp[0] += 10 + elif event.key == pygame.K_SPACE: + drain = True + elif event.type == pygame.KEYUP: + if event.key == pygame.K_SPACE: + drain = False + elif event.type == pygame.QUIT: + quit() + +def handle_wave_events(): + global drain + for event in pygame.event.get(): + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_j: + charge[0] += 100 + charge[11] -= 100 + elif event.key == pygame.K_k: + charge[5] += 100 + charge[7] -= 100 + elif event.key == pygame.K_SPACE: + drain = True + elif event.type == pygame.KEYUP: + if event.key == pygame.K_SPACE: + drain = False + elif event.type == pygame.QUIT: + quit() + def show_data(screen): energy = 0.5*(sum(q*q for q in charge) + inductance*sum(i*i for i in current)) text = font.render('energy', True, (255, 255, 255)) @@ -158,22 +206,8 @@ if __name__ == '__main__': to_light = 0 while True: # handle events - for event in pygame.event.get(): - if event.type == pygame.KEYDOWN: - if event.key == pygame.K_j: - charge[0] += 100 - charge[11] -= 100 - elif event.key == pygame.K_k: - charge[5] += 100 - charge[7] -= 100 - elif event.key == pygame.K_SPACE: - drain = True - pygame.draw.aaline(screen, (255, 255, 255), (0, 0), (viewsize, viewsize)) - elif event.type == pygame.KEYUP: - if event.key == pygame.K_SPACE: - drain = False - elif event.type == pygame.QUIT: - quit() + ##handle_wave_events() + handle_heat_events() # clear screen screen.blit(background, (0, 0)) @@ -183,11 +217,12 @@ if __name__ == '__main__': # show state for e in range(30): - set_wave_light(e, current[e]) + ##set_wave_light(e, current[e]) + set_heat_light(e, temp[e]) # evolve state - wave_evolution() - ##heat_evolution() + ##wave_evolution() + heat_evolution() # step pygame.display.flip() From b11420daab66646f067d0fd7b315c25142af3930 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sun, 29 Sep 2019 03:40:43 +0200 Subject: [PATCH 2/3] Update instructions --- interactions.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/interactions.py b/interactions.py index 073dce1..d3e8b31 100644 --- a/interactions.py +++ b/interactions.py @@ -184,21 +184,22 @@ def handle_wave_events(): quit() def show_data(screen): - energy = 0.5*(sum(q*q for q in charge) + inductance*sum(i*i for i in current)) + energy = sum(temp) text = font.render('energy', True, (255, 255, 255)) screen.blit(text, (20, viewsize)) text = font.render(str(energy), True, (255, 255, 255)) screen.blit(text, (120, viewsize)) - text = font.render('charge[0]', True, (255, 255, 255)) + text = font.render('temp[0]', True, (255, 255, 255)) screen.blit(text, (20, 30 + viewsize)) - text = font.render(str(charge[0]), True, (255, 255, 255)) + text = font.render(str(temp[0]), True, (255, 255, 255)) screen.blit(text, (120, 30 + viewsize)) if __name__ == '__main__': # set up background background = pygame.Surface(screen.get_size()).convert() background.fill((32, 32, 32)) - text = font.render('press [j] or [k] to pluck', True, (255, 255, 255)) + ##text = font.render('press [j] or [k] to pluck', True, (255, 255, 255)) + text = font.render('press [j] to pluck', True, (255, 255, 255)) background.blit(text, (340, viewsize)) text = font.render('hold [space] to drain', True, (255, 255, 255)) background.blit(text, (340, 30 + viewsize)) From 56f42684f3e6f99db1e0211928c1cb872bc08116 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sun, 29 Sep 2019 03:42:13 +0200 Subject: [PATCH 3/3] Turn on bridge connection --- interactions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interactions.py b/interactions.py index d3e8b31..8f478a7 100644 --- a/interactions.py +++ b/interactions.py @@ -55,8 +55,8 @@ clock = pygame.time.Clock() # --- copied from firestar.py -##b = phue.Bridge('172.18.130.12') -b = None +b = phue.Bridge('172.18.130.12') +##b = None Nedges = 30; edgecode = [None] * Nedges;