aboutsummaryrefslogtreecommitdiff
path: root/pixelcore
diff options
context:
space:
mode:
authorGravatar Russell Cohen <rcoh@mit.edu>2010-11-25 21:44:00 -0500
committerGravatar Russell Cohen <rcoh@mit.edu>2010-11-25 21:44:00 -0500
commit5783d6336f014c05e0e46d7bc35533e70b280582 (patch)
treeb4e0b0b2787b8fe464baadbd375ad6dc6c1dbf76 /pixelcore
parentb042647b68abdc82490ca6e059993b8eba28904c (diff)
Added BehaviorChain to support chains of behaviors. Added FollowMouse
parameter to PygameInput to support following of mice. Added component registry to Util which allows any component to access any other component. Some changes to the structure of LightInstallation.
Diffstat (limited to 'pixelcore')
-rw-r--r--pixelcore/Pixel.py3
-rw-r--r--pixelcore/PixelStrip.py3
2 files changed, 1 insertions, 5 deletions
diff --git a/pixelcore/Pixel.py b/pixelcore/Pixel.py
index 6784c63..a71dba5 100644
--- a/pixelcore/Pixel.py
+++ b/pixelcore/Pixel.py
@@ -32,12 +32,9 @@ class Pixel:
eventResult = event.state(currentTime-eventTime)
if eventResult != None:
resultingColor = Util.combineColors(eventResult, resultingColor)
- print resultingColor
else:
deadEvents.append(eventTime)
[self.events.pop(event) for event in deadEvents]
- if sum(resultingColor) > 0:
- print resultingColor
return tuple(resultingColor)
def __str__(self):
return 'Loc: ' + str(self.location)
diff --git a/pixelcore/PixelStrip.py b/pixelcore/PixelStrip.py
index 14c87d9..45d2c8b 100644
--- a/pixelcore/PixelStrip.py
+++ b/pixelcore/PixelStrip.py
@@ -21,14 +21,13 @@ class PixelStrip:
[l.turnOnFor(time) for l in self.pixels] #TODO: add test-on method to
#pixels
def respond(self, responseInfo):
- print 'PixelEvent', responseInfo
location = responseInfo[Util.location]
if not 'PixelEvent' in responseInfo:
if 'Color' in responseInfo:
color = responseInfo['Color']
else:
raise Exception('Need Color. Probably')
- responseInfo['PixelEvent'] = StepEvent.generate(300, color)
+ responseInfo['PixelEvent'] = StepEvent.generate(300, color)
(dist, pixel) = self.getPixelNearest(location)
pixel.processInput(responseInfo['PixelEvent'], 0) #TODO: z-index