diff options
| author |  dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
|---|---|---|
| committer | dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
| commit | b11a72afece56dc138aac5400057668e8388f43d (patch) | |
| tree | b779455122ee1987d3fcd9b51fcffa8d03057b86 /pixelcore/Pixel.py | |
| parent | 6a0bfdfb00944ae0bcc6215a194c3290b4a085f2 (diff) | |
| parent | b67a37ad06fa4c97dcdb32cecc71c7f492b12840 (diff) | |
Merge branch 'fridaydemo' of github.com:rcoh/SmootLight into osc
Conflicts:
behaviors/ControllerOSC.py
Diffstat (limited to 'pixelcore/Pixel.py')
| -rw-r--r-- | pixelcore/Pixel.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pixelcore/Pixel.py b/pixelcore/Pixel.py index 6ff2e67..4e7cfce 100644 --- a/pixelcore/Pixel.py +++ b/pixelcore/Pixel.py @@ -1,4 +1,5 @@ import util.ColorOps as color +from logger import main_log import pdb from pixelevents.StepEvent import * import util.TimeOps as timeops @@ -57,7 +58,8 @@ class Pixel: if eventResult != None: scaledEvent = color.multiplyColor(eventResult,scale) if (scaledEvent[0] + scaledEvent[1] + scaledEvent[2]) < 5: - deadEvents.append(eventObj) + pass + #deadEvents.append(eventObj) else: colors.append(scaledEvent) else: |