diff options
| author |  rcoh <rcoh@mit.edu> | 2010-12-08 16:39:50 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2010-12-08 16:39:50 -0500 |
| commit | b335b746523ffd59db1402b097a802b3fd99eaac (patch) | |
| tree | 74333be1820f3d2666358c3b009beb14bf929256 /pixelcore | |
| parent | 353ab16db64c86122c0fcb9e1852b85c14b354b8 (diff) | |
Code for the demo. Everything works afaik. Contains a couple more optimizations. Contains modify param behavior. Improved support for recursive hooks. Modifications to SmootCoreObject to get us closer to a fully multi-threaded system. This should be the last commit directly to master. All further commits should be on subranches and get merged.
Diffstat (limited to 'pixelcore')
| -rw-r--r-- | pixelcore/Pixel.py | 1 | ||||
| -rw-r--r-- | pixelcore/Screen.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pixelcore/Pixel.py b/pixelcore/Pixel.py index 4c8ec89..ba87dff 100644 --- a/pixelcore/Pixel.py +++ b/pixelcore/Pixel.py @@ -47,6 +47,7 @@ class Pixel: else: deadEvents.append(eventTime) [self.events.pop(event) for event in deadEvents] + resultingColor = [int(round(c)) for c in resultingColor] self.memState = tuple(resultingColor) return tuple(resultingColor) def __str__(self): diff --git a/pixelcore/Screen.py b/pixelcore/Screen.py index 71b9b0b..92805a8 100644 --- a/pixelcore/Screen.py +++ b/pixelcore/Screen.py @@ -59,9 +59,9 @@ class Screen: minY = min(y, minY) maxY = max(y, maxY) - self.size = (minX, minY, maxX, maxY) + self.size = (0,0, maxX, maxY) self.sizeValid = True - return (minX, minY, maxX, maxY) + return (0, 0, maxX+100, maxY+100) #TODO: cleaner #private def processResponse(self, responseInfo): #we need to make a new dict for #each to prevent interference |