aboutsummaryrefslogtreecommitdiff
path: root/pixelevents
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2010-12-15 00:18:24 -0500
committerGravatar rcoh <rcoh@mit.edu>2010-12-15 00:18:24 -0500
commita89c772cd64c6790906734f7128947e0f453c7e3 (patch)
tree250e0b0d235e1215fa7b40fcfd24b74028ccf643 /pixelevents
parent8cecf83f16fcdec5b3ee68cc40c2b360e0f845d0 (diff)
About halfway done with the Util cleanup. Some stuff left to do with scoping etc.
Diffstat (limited to 'pixelevents')
-rw-r--r--pixelevents/DecayEvent.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pixelevents/DecayEvent.py b/pixelevents/DecayEvent.py
index 9a7c600..0b4c820 100644
--- a/pixelevents/DecayEvent.py
+++ b/pixelevents/DecayEvent.py
@@ -1,5 +1,6 @@
from operationscore.PixelEvent import *
-import Util, math
+import math
+from util.ColorOps import *
class DecayEvent(PixelEvent):
def initEvent(self):
self['Coefficient'] = abs(self['Coefficient'])
@@ -8,7 +9,7 @@ class DecayEvent(PixelEvent):
decay = math.exp(timeDelay*-1*self['Coefficient'])
if self['DecayType'] == 'Proportional':
decay = float(self['Coefficient']) / timeDelay
- color = Util.multiplyColor(self['Color'], decay)
+ color = multiplyColor(self['Color'], decay)
return color if sum(color) > 5 else None
@staticmethod
def generate(decayType, coefficient, color):