diff options
author | eugue <eug.sun@gmail.com> | 2011-01-24 14:41:38 -0500 |
---|---|---|
committer | eugue <eug.sun@gmail.com> | 2011-01-24 14:41:38 -0500 |
commit | 00e836cfa4e2652d724972585d661143142af002 (patch) | |
tree | f612ea43024f13dc8c16f192735676e9976630fc /pixelcore/Pixel.py | |
parent | d39f871cf9fcce13c6db315052a4951f692719f9 (diff) |
merge with biginstall
Diffstat (limited to 'pixelcore/Pixel.py')
-rw-r--r-- | pixelcore/Pixel.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pixelcore/Pixel.py b/pixelcore/Pixel.py index b9fc07f..7260e56 100644 --- a/pixelcore/Pixel.py +++ b/pixelcore/Pixel.py @@ -29,10 +29,10 @@ class Pixel: #arg #Add a pixelEvent to the list of active events - def processInput(self,pixelEvent,zindex, currentTime=None): #consider migrating arg to dict + def processInput(self,pixelEvent,zindex, scale=1,currentTime=None): #consider migrating arg to dict if currentTime == None: currentTime = timeops.time() - self.events[currentTime] = (zindex, pixelEvent) + self.events[currentTime] = (zindex,scale, pixelEvent) def clearAllEvents(self): self.events = {} @@ -49,10 +49,10 @@ class Pixel: resultingColor = (0,0,0) colors = [] for eventTime in self.events: #TODO: right color weighting code - (zindex,event) = self.events[eventTime] + (zindex,scale,event) = self.events[eventTime] eventResult = event.state(currentTime-eventTime) if eventResult != None: - colors.append(eventResult) + colors.append(color.multiplyColor(eventResult,scale)) else: deadEvents.append(eventTime) |