From e34b4dbf8ba67c5374e43bea8b469172025a9163 Mon Sep 17 00:00:00 2001
From: Daniel <dmt@daniel-desktop.(none)>
Date: Sat, 29 Jan 2011 18:50:58 -0800
Subject: 6thFloorOsc commented out renderer to lights, default
 LightInstallation config and profile.py for OSC :)

---
 LightInstallation.py   | 2 +-
 Profile.py             | 2 +-
 config/6thFloorOSC.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LightInstallation.py b/LightInstallation.py
index c1f01e8..41cc925 100755
--- a/LightInstallation.py
+++ b/LightInstallation.py
@@ -193,7 +193,7 @@ class LightInstallation(object):
             
 def main(argv):
     if len(argv) == 1:
-        l = LightInstallation('LightInstallationConfig.xml')
+        l = LightInstallation('config/6thFloor.xml')
     else:
         l = LightInstallation(argv[1])
         
diff --git a/Profile.py b/Profile.py
index 2f180c9..2f796b2 100644
--- a/Profile.py
+++ b/Profile.py
@@ -1,4 +1,4 @@
 import cProfile
 from LightInstallation import main
-command = """main(['', 'config/6thFloor.xml'])"""
+command = """main(['', 'config/6thFloorOSC.xml'])"""
 cProfile.runctx(command, globals(), locals(), filename="smootlight.profile")
diff --git a/config/6thFloorOSC.xml b/config/6thFloorOSC.xml
index cb1fd10..ca99b2b 100644
--- a/config/6thFloorOSC.xml
+++ b/config/6thFloorOSC.xml
@@ -29,9 +29,9 @@
         </PixelMapper>
     </PixelMapperConfiguration>
     <RendererConfiguration>
-        <Renderer>
+        <!--Renderer>
             <InheritsFrom>renderers/60StripSeq.xml</InheritsFrom>
-        </Renderer>
+        </Renderer-->
         <Renderer>
             <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
         </Renderer>
-- 
cgit v1.2.3


From 482a94fd48627153b923931d6ff21ebf57fad6f7 Mon Sep 17 00:00:00 2001
From: Daniel <dmt@daniel-desktop.(none)>
Date: Sat, 29 Jan 2011 19:34:24 -0800
Subject: removed duplicate OSC server--one is much faster. Building more into
 custom input would probably be even faster.

---
 config/6thFloorOSC.xml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/config/6thFloorOSC.xml b/config/6thFloorOSC.xml
index ca99b2b..05c2973 100644
--- a/config/6thFloorOSC.xml
+++ b/config/6thFloorOSC.xml
@@ -40,19 +40,19 @@
         <InputElement>
             <Class>inputs.OSCInput</Class>
             <Args>
-                <Id>osc2</Id>
+                <Id>osc</Id>
                 <Port>1234</Port>
                 <RefreshInterval>10</RefreshInterval>
             </Args>
         </InputElement>
-        <InputElement>
+        <!--InputElement>
             <Class>inputs.OSCInput</Class>
             <Args>
                 <Id>osc</Id>
                 <Port>12345</Port>
                 <RefreshInterval>20</RefreshInterval>
             </Args>
-        </InputElement>
+        </InputElement-->
         <InputElement>
             <Class>inputs.PygameInput</Class>
             <Args><!--Passed as a dictionary-->
@@ -110,7 +110,7 @@
             <YStep>3</YStep>
         </Args>
     </Behavior>
-	<Behavior>
+	<!--Behavior>
 	  <Class>behaviors.MobileShakeBehavior</Class>
 	  <Args>
 	    <Id>mobileshake</Id>
@@ -131,7 +131,7 @@
 	    <RenderToScreen>True</RenderToScreen>
 	    <Mapper>simplemap</Mapper>
 	  </Args>
-	</Behavior>
+	</Behavior-->
     <Behavior>
             <Args>
                 <Id>sixaxis</Id>
@@ -188,7 +188,7 @@
                 <LocationRestriction>{y}&lt;0 or {y}&gt;200</LocationRestriction>
             </Args>
         </Behavior>
-        <Behavior>
+        <!--Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
                 <Id>movebounce</Id>
@@ -215,8 +215,8 @@
                 <RenderToScreen>True</RenderToScreen>
                 <Mapper>gaussmap</Mapper>
            </Args>
-       </Behavior>
-       <Behavior>
+       </Behavior-->
+       <!--Behavior>
             <Class>behaviors.DebugBehavior</Class>
             <Args>
                 <Id>debug</Id>
@@ -225,7 +225,7 @@
                     <Id>pygame</Id>
                 </Inputs>
             </Args>
-        </Behavior>
+        </Behavior-->
         <Behavior>
             <Class>behaviors.AllPixelsLeft</Class>
             <Args>
@@ -245,7 +245,7 @@
                 <Id>allpixels</Id>
             </Args>
         </Behavior>
-        <Behavior Id="recursivedecay">
+        <!--Behavior Id="recursivedecay">
             <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom>
             <Args>
                 <InitialResponseCount>50</InitialResponseCount>
@@ -267,8 +267,8 @@
                 <RenderToScreen>False</RenderToScreen>
                 <Mapper>gaussmap</Mapper>
             </Args>
-        </Behavior>
-        <Behavior>
+        </Behavior-->
+        <!--Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
                 <Id>randomwalk</Id>
@@ -320,13 +320,13 @@
                     <Id>recursivedecay</Id>
                 </ChainedBehaviors>
             </Args>
-        </Behavior>
+        </Behavior-->
         <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
-                <Id>mousechaser2</Id>
+                <Id>SixaxisChase</Id>
                 <Inputs>
-                    <Id>osc2</Id>
+                    <Id>osc</Id>
                 </Inputs>
                 <ChainedBehaviors>
                     <Id>sixaxis</Id>
@@ -339,9 +339,8 @@
         <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
-                <Id>mousechaser</Id>
+                <Id>OSCTouchChase</Id>
                 <Inputs>
-                    <!--Id>followmouse</Id-->
                     <Id>osc</Id>
                 </Inputs>
                 <ChainedBehaviors>
-- 
cgit v1.2.3


From 082e4b0c53123dd377da148541f7d98516716862 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Tue, 1 Feb 2011 23:13:57 -0500
Subject: cleanup on aisle 3 (in 6thfloorosc.xml)

---
 config/6thFloorOSC.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/6thFloorOSC.xml b/config/6thFloorOSC.xml
index 792fd0c..ce60c74 100644
--- a/config/6thFloorOSC.xml
+++ b/config/6thFloorOSC.xml
@@ -273,9 +273,9 @@
                 </Inputs>
                 <ChainedBehaviors>
                     <Id>touchosc</Id>
-                    <Id>square</Id>
-                    <Id>singleframe</Id>
+                    <Id>decay</Id>
                 </ChainedBehaviors>
+                <Mapper>gaussmap</Mapper>
                 <RenderToScreen>True</RenderToScreen>
             </Args>
         </Behavior>
-- 
cgit v1.2.3


From 834cd2b0eaa27cfdba67d712d5d14120c6a441c3 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Fri, 4 Feb 2011 23:08:22 -0500
Subject: couple changes

---
 pixelcore/Pixel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixelcore/Pixel.py b/pixelcore/Pixel.py
index 4e7cfce..cf5a328 100644
--- a/pixelcore/Pixel.py
+++ b/pixelcore/Pixel.py
@@ -8,7 +8,7 @@ class Pixel:
     keyed by event time).  Every time is state is
     requested, it processes all the members of its queue.  If a member returns none,
     it is removed from the queue.  Otherwise, its value added to the Pixels color
-    weighted by z-index."""
+    weighted by z-index.  To get the current color of the pixel, call the state method."""
 
     radius = 2
     timeOff = -1
-- 
cgit v1.2.3