diff options
| -rw-r--r-- | ShowRunner.py | 4 | ||||
| -rw-r--r-- | fish_show.py | 6 | ||||
| -rwxr-xr-x | webapp/run.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ShowRunner.py b/ShowRunner.py index 05877ed..0357efd 100644 --- a/ShowRunner.py +++ b/ShowRunner.py @@ -10,8 +10,8 @@ from run import server_thread, send_queue, recv_queue def run_show(): server_thread.start() bridge = Bridge() - SunriseShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE) +# SunriseShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE) FishShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE) print "done!" -run_show()
\ No newline at end of file +run_show() diff --git a/fish_show.py b/fish_show.py index cb80d55..e410895 100644 --- a/fish_show.py +++ b/fish_show.py @@ -11,6 +11,7 @@ from fish_types import Fish class Light(object): """Represent a bridge light and its state.""" + __slots__=('light', 'color', 'transitioning_to', 'x', 'y', 'step') def __init__(self, x, y, light): """Store all facts about a light.""" self.light = light @@ -34,8 +35,9 @@ class Light(object): new_color = new_background for fish in fishes: coverage = compute_coverage(fish, self.x, self.y) - fish_color = fish.color_at(self.x, self.y) - new_color = coverage * fish_color + (1 - coverage) * new_color + if coverage > 0.01: + fish_color = fish.color_at(self.x, self.y) + new_color = coverage * fish_color + (1 - coverage) * new_color self.light.setRGBRaw( *map(lambda x: clamp(0, x, 1), new_color.components) ) diff --git a/webapp/run.py b/webapp/run.py index 2290f41..fb270a9 100755 --- a/webapp/run.py +++ b/webapp/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -sys.path.append('packages') +sys.path.append('webapp/packages') import threading |