From 3036cc366e992c451d783635cbe9a50a606c8fce Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Wed, 29 Dec 2010 13:08:22 -0500
Subject: early.

---
 util/ColorOps.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/util/ColorOps.py b/util/ColorOps.py
index b0d64a7..9da27fb 100644
--- a/util/ColorOps.py
+++ b/util/ColorOps.py
@@ -1,4 +1,5 @@
 import random
+from util.TimeOps import Stopwatch
 def randomColor():
     return [random.randint(0,255) for i in range(3)]
 def chooseRandomColor(colorList):
@@ -8,4 +9,10 @@ def safeColor(c):
 def combineColors(c1,c2):
     return safeColor([c1[i]+c2[i] for i in range(min(len(c1),len(c2)))])
 def multiplyColor(color, percent):
-    return safeColor([channel*(percent) for channel in color])
+    return safeColor([fastMultiply(channel, percent, 1) for channel in color])
+
+def fastMultiply(value, mult, acc):
+    if type(mult) == type(int(5)):
+        return value*mult
+    return int(value)*int(mult*10**acc)*10**(-acc)
+
-- 
cgit v1.2.3


From 69449f1991952cee28c597f1a2bbb3f927751447 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Wed, 29 Dec 2010 15:34:47 -0500
Subject: a couple improvements.  nothing huge.

---
 config/Outdoor.xml           | 8 ++++----
 operationscore/PixelEvent.py | 2 ++
 renderers/PygameRenderer.py  | 6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/Outdoor.xml b/config/Outdoor.xml
index 8ba7962..65df4d0 100644
--- a/config/Outdoor.xml
+++ b/config/Outdoor.xml
@@ -20,7 +20,7 @@
             <Args>
                 <Id>gaussmap</Id>
                 <CutoffDist>20</CutoffDist>
-                <Width>3</Width>
+                <Width>1</Width>
                 <Height>1</Height>
             </Args>
         </PixelMapper>
@@ -93,7 +93,7 @@
             <Class>behaviors.RecursiveDecay</Class>
             <Args>
                 <Id>recursivedecay</Id>
-                <InitialResponseCount>70</InitialResponseCount>
+                <InitialResponseCount>700</InitialResponseCount>
             </Args>
         </Behavior>
         <Behavior>
@@ -110,7 +110,7 @@
                 </ChainedBehaviors>
                 <RecursiveHooks>{'running':'acceleratedie'}</RecursiveHooks>
                 <RenderToScreen>True</RenderToScreen>
-                <Mapper>gaussmap</Mapper>
+                <!--<Mapper>gaussmap</Mapper>-->
             </Args>
         </Behavior>
         <Behavior>
@@ -119,7 +119,7 @@
                 <Id>accelerate</Id>
                 <ParamType>Sensor</ParamType>
                 <ParamName>StepSize</ParamName>
-                <ParamOp>{val}*1.05</ParamOp>
+                <ParamOp>{val}*1.01</ParamOp>
             </Args>
         </Behavior>
         <Behavior>
diff --git a/operationscore/PixelEvent.py b/operationscore/PixelEvent.py
index e2b852a..6b0812f 100644
--- a/operationscore/PixelEvent.py
+++ b/operationscore/PixelEvent.py
@@ -11,6 +11,8 @@ class PixelEvent(SmootCoreObject):
         pass
     #Returns  a new PixelEvent, but with a response scaled by c.
     def scale(self,c):
+        if c == 1:
+            return self
         newDict = dict(self.argDict) 
         newDict['Color'] = color.multiplyColor(newDict['Color'], c)
         return self.__class__(newDict)
diff --git a/renderers/PygameRenderer.py b/renderers/PygameRenderer.py
index 6f7f65b..a10700b 100644
--- a/renderers/PygameRenderer.py
+++ b/renderers/PygameRenderer.py
@@ -1,4 +1,5 @@
 from operationscore.Renderer import *
+import util.TimeOps as clock
 import pygame
 from pygame.locals import *
 import pdb
@@ -9,6 +10,8 @@ class PygameRenderer(Renderer):
         self.background = pygame.Surface(self.screen.get_size())
         self.background = self.background.convert()
         self.background.fill(Color('Black'))
+        self.stopwatch = clock.Stopwatch()
+        self.stopwatch.start()
     def render(self, lightSystem):
         self.background.fill(Color('Black'))
         #print 'drawing color:',light.color
@@ -18,3 +21,6 @@ class PygameRenderer(Renderer):
 
         self.screen.blit(self.background, (0,0))
         pygame.display.flip()
+        self.stopwatch.stop()
+        pygame.display.set_caption(str(int(1000/self.stopwatch.elapsed())))
+        self.stopwatch.start()
-- 
cgit v1.2.3