From da934a838305bab72bd12dcd2b83e689f7c1cc3f Mon Sep 17 00:00:00 2001
From: Jim Salem <jsalem@gmail.com>
Date: Fri, 28 Jan 2011 18:28:25 -0500
Subject: New Flasher behavior which fades colors in and out. Several new color
 functions. Created a "firefly" demo (moving colored bubbles that fade in and
 out)

---
 config/FireflyDemo.xml | 261 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 config/FireflyDemo.xml

(limited to 'config')

diff --git a/config/FireflyDemo.xml b/config/FireflyDemo.xml
new file mode 100644
index 0000000..8008168
--- /dev/null
+++ b/config/FireflyDemo.xml
@@ -0,0 +1,261 @@
+<!-- Demo of the flasher behavior.  -->
+<!-- Bubbles or fireflies move around and fade on and off  -->
+<!-- Jim Salem 1/28/11 jsalem@gmail.com -->
+<!-- Movement is pretty wonky. -->
+
+<!---All configuration items contain a "Class" tag specifying the python class they represent, and an "Args" tag specifying the args to be passed in.-->
+<LightInstallation>
+    <InstallationConfiguration>
+        <Defaults>
+            <PixelMapper>simplemap</PixelMapper>
+        </Defaults>
+    </InstallationConfiguration>
+    <PixelConfiguration>
+        <InheritsFrom>layouts/60StripLayout.xml</InheritsFrom>
+    </PixelConfiguration>
+    <PixelMapperConfiguration>
+        <PixelMapper>
+            <Class>pixelmappers.SimpleMapper</Class>
+            <Args>
+                <Id>simplemap</Id>
+                <CutoffDist>20</CutoffDist>
+            </Args>
+        </PixelMapper>
+        <PixelMapper>
+            <Class>pixelmappers.GaussianMapper</Class>
+            <Args>
+                <Id>gaussmap</Id>
+                <CutoffDist>30</CutoffDist>
+                <MinWeight>0.1</MinWeight>
+                <Width>10</Width>
+                <Height>1</Height>
+            </Args>
+        </PixelMapper>
+    </PixelMapperConfiguration>
+    <RendererConfiguration>
+<!--
+        <Renderer>
+            <InheritsFrom>renderers/60StripSeq.xml</InheritsFrom>
+        </Renderer>
+-->
+        <Renderer>
+            <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
+        </Renderer>
+    </RendererConfiguration>
+    <InputConfiguration>
+        <InputElement>
+            <Class>inputs.PygameInput</Class>
+            <Args>
+                <Id>pygameclick</Id>
+                <RefreshInterval>10</RefreshInterval>
+                <Clicks>True</Clicks>
+            </Args>
+        </InputElement>
+        <InputElement>
+            <Class>inputs.PygameInput</Class>
+            <Args>
+                <Id>pygamekey</Id>
+                <RefreshInterval>10</RefreshInterval>
+                <Keyboard>True</Keyboard>
+            </Args>
+        </InputElement>
+        <InputElement>
+            <Class>inputs.UDPInput</Class>
+            <Args>
+                <Id>udp</Id>
+                <Port>3344</Port>
+                <RefreshInterval>50</RefreshInterval>
+            </Args>
+        </InputElement>
+        <!--<InputElement>
+            <Class>inputs.TCPInput</Class>
+            <Args>
+                <Id>tcp</Id>
+                <Port>20120</Port>
+                <RefreshInterval>10</RefreshInterval>
+            </Args>
+        </InputElement>-->
+        <InputElement Id="followmouse">
+            <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom>
+        </InputElement>
+    </InputConfiguration>
+
+    <BehaviorConfiguration>
+        <Behavior>
+	    <Class>behaviors.RandomSetBrightColorBehavior</Class>
+	    <Args>
+	      <Id>setbrightcolor</Id>
+	    </Args>
+        </Behavior>
+
+        <Behavior Id="colorchange">
+            <InheritsFrom>behaviors/RandomColor.xml</InheritsFrom>
+            <Args>
+                <ColorList>
+                    <Val>(255,0,0)</Val>
+                    <Val>(0,0,255)</Val>
+                </ColorList>
+            </Args>
+        </Behavior>
+        <Behavior Id="fastdecay">
+            <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
+            <Args>
+                <Coefficient>.5</Coefficient>
+            </Args>
+        </Behavior>
+        <Behavior Id="decay">
+            <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
+        </Behavior>
+        <Behavior Id="singleframe">
+            <InheritsFrom>behaviors/SingleFrame.xml</InheritsFrom>
+        </Behavior>
+        <Behavior Id="slowdecay">
+            <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
+            <Args>
+                <Coefficient>.01</Coefficient>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.XYMove</Class>
+            <Args>
+                <Id>xymove</Id>
+                <XStep>5</XStep>
+                <YStep>2</YStep>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.RestrictLocation</Class>
+            <Args>
+                <Id>xbounce</Id>
+                <Action>{val}*-1</Action>
+                <ParamName>XStep</ParamName>
+                <LocationRestriction>{x}&lt;0 or {x}&gt;800</LocationRestriction>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.RestrictLocation</Class>
+            <Args>
+                <Id>ybounce</Id>
+                <Action>{val}*-1</Action>
+                <ParamName>YStep</ParamName>
+                <LocationRestriction>{y}&lt;0 or {y}&gt;200</LocationRestriction>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.BehaviorChain</Class>
+            <Args>
+                <Id>movebounce</Id>
+                <ChainedBehaviors>
+                    <Id>xymove</Id>
+                    <Id>ybounce</Id>
+                    <Id>xbounce</Id>
+                </ChainedBehaviors>
+            </Args>
+        </Behavior>
+	<Behavior>
+	  <Class>behaviors.Flasher</Class>
+	  <Args>
+	    <Id>flasher</Id>
+	  </Args>
+	</Behavior>
+
+        <Behavior>
+            <Class>behaviors.BehaviorChain</Class>
+            <Args>
+                <Id>flashermovebounce</Id>
+                <ChainedBehaviors>
+                    <Id>randmovement</Id>
+                    <Id>ybounce</Id>
+                    <Id>xbounce</Id>
+		    <!-- <Id>fadecolor</Id> -->
+		    <Id>flasher</Id>
+                </ChainedBehaviors>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.Square</Class>
+            <Args>
+                <Id>square</Id>
+                <Width>15</Width>
+            </Args>
+        </Behavior>
+        <Behavior Id="recursivedecay">
+            <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom>
+            <Args>
+                <InitialResponseCount>80</InitialResponseCount>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.RandomWalk</Class>
+            <Args>
+                <Id>randmovement</Id>
+                <StepSize>20</StepSize>
+            </Args>
+        </Behavior>
+
+	<Behavior>
+	  <Class>behaviors.ModifyParam</Class>
+	  <Args>
+	    <Id>fadecolor</Id>
+            <ParamType>Sensor</ParamType>
+            <ParamName>Color</ParamName>
+            <ParamOp>[chan*.98 for chan in {val}]</ParamOp>
+	  </Args>
+	</Behavior>
+
+        <Behavior>
+            <Class>behaviors.BehaviorChain</Class>
+            <Args>
+                <Id>runcolordecay</Id>
+                <Inputs>
+                    <Id>pygameclick</Id>
+                </Inputs>
+                <ChainedBehaviors>
+                    <Id>setbrightcolor</Id>
+                    <Id>mover</Id>
+                    <Id>decay</Id>
+                </ChainedBehaviors>
+                <RecursiveHooks>{'mover':'flashermovebounce'}</RecursiveHooks>
+                <RenderToScreen>True</RenderToScreen>
+                <Mapper>gaussmap</Mapper>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.ResponseMover</Class>
+            <Args>
+                <Id>mover</Id>
+            </Args>
+        </Behavior>
+        <Behavior Id="accelerate">
+            <InheritsFrom>behaviors/Accelerate.xml</InheritsFrom>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.EchoBehavior</Class>
+            <Args>
+                <Id>echo</Id>
+                <z-index>0</z-index>
+		<Color>(90,90,90)</Color>
+                <RenderToScreen>False</RenderToScreen>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.BehaviorChain</Class>
+            <Args>
+                <Id>mousechaser</Id>
+                <Inputs>
+                    <Id>followmouse</Id>
+                </Inputs>
+                <ChainedBehaviors>
+                    <Id>echo</Id>
+                    <Id>square</Id>
+                    <Id>singleframe</Id>
+                </ChainedBehaviors>
+                <RenderToScreen>True</RenderToScreen>
+            </Args>
+        </Behavior>
+
+        <Behavior Id="running">
+            <InheritsFrom>behaviors/RunningBehavior.xml</InheritsFrom>
+        </Behavior>
+    </BehaviorConfiguration>
+</LightInstallation>
-- 
cgit v1.2.3


From 277a5143165d2553ce5e97f151cc6b3cea426468 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Sat, 29 Jan 2011 21:15:28 -0500
Subject: A couple bits of cleanup to the firefly code

---
 behaviors/Flasher.py   |  12 +++---
 config/FireflyDemo.xml | 106 ++-----------------------------------------------
 2 files changed, 10 insertions(+), 108 deletions(-)

(limited to 'config')

diff --git a/behaviors/Flasher.py b/behaviors/Flasher.py
index 4a2dad4..1d79d41 100644
--- a/behaviors/Flasher.py
+++ b/behaviors/Flasher.py
@@ -1,14 +1,14 @@
-# Implements a pulsing/flashing behavior.
-# Jim Salem: jsalem@gmail.com
-#
-# Args:
-#   Factor - The speed of flashing. Must be b/w 0 and 1.  Default is .95
-#
 
 from operationscore.Behavior import *
 import util.ColorOps as colorops
 import pdb
 class Flasher(Behavior):
+    """Implements a pulsing/flashing behavior.
+     Jim Salem: jsalem@gmail.com
+
+     Args:
+       Factor - The speed of flashing. Must be b/w 0 and 1.  Default is .95
+    """
     def processResponse(self, sensorInputs, recursiveInputs):
         ret = []
         for response in sensorInputs:
diff --git a/config/FireflyDemo.xml b/config/FireflyDemo.xml
index 8008168..856569e 100644
--- a/config/FireflyDemo.xml
+++ b/config/FireflyDemo.xml
@@ -33,11 +33,9 @@
         </PixelMapper>
     </PixelMapperConfiguration>
     <RendererConfiguration>
-<!--
         <Renderer>
             <InheritsFrom>renderers/60StripSeq.xml</InheritsFrom>
         </Renderer>
--->
         <Renderer>
             <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
         </Renderer>
@@ -67,62 +65,18 @@
                 <RefreshInterval>50</RefreshInterval>
             </Args>
         </InputElement>
-        <!--<InputElement>
-            <Class>inputs.TCPInput</Class>
-            <Args>
-                <Id>tcp</Id>
-                <Port>20120</Port>
-                <RefreshInterval>10</RefreshInterval>
-            </Args>
-        </InputElement>-->
-        <InputElement Id="followmouse">
-            <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom>
-        </InputElement>
     </InputConfiguration>
 
     <BehaviorConfiguration>
         <Behavior>
-	    <Class>behaviors.RandomSetBrightColorBehavior</Class>
-	    <Args>
-	      <Id>setbrightcolor</Id>
-	    </Args>
-        </Behavior>
-
-        <Behavior Id="colorchange">
-            <InheritsFrom>behaviors/RandomColor.xml</InheritsFrom>
+            <Class>behaviors.RandomSetBrightColorBehavior</Class>
             <Args>
-                <ColorList>
-                    <Val>(255,0,0)</Val>
-                    <Val>(0,0,255)</Val>
-                </ColorList>
-            </Args>
-        </Behavior>
-        <Behavior Id="fastdecay">
-            <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
-            <Args>
-                <Coefficient>.5</Coefficient>
+                <Id>setbrightcolor</Id>
             </Args>
         </Behavior>
         <Behavior Id="decay">
             <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
         </Behavior>
-        <Behavior Id="singleframe">
-            <InheritsFrom>behaviors/SingleFrame.xml</InheritsFrom>
-        </Behavior>
-        <Behavior Id="slowdecay">
-            <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom>
-            <Args>
-                <Coefficient>.01</Coefficient>
-            </Args>
-        </Behavior>
-        <Behavior>
-            <Class>behaviors.XYMove</Class>
-            <Args>
-                <Id>xymove</Id>
-                <XStep>5</XStep>
-                <YStep>2</YStep>
-            </Args>
-        </Behavior>
         <Behavior>
             <Class>behaviors.RestrictLocation</Class>
             <Args>
@@ -141,24 +95,12 @@
                 <LocationRestriction>{y}&lt;0 or {y}&gt;200</LocationRestriction>
             </Args>
         </Behavior>
-        <Behavior>
-            <Class>behaviors.BehaviorChain</Class>
-            <Args>
-                <Id>movebounce</Id>
-                <ChainedBehaviors>
-                    <Id>xymove</Id>
-                    <Id>ybounce</Id>
-                    <Id>xbounce</Id>
-                </ChainedBehaviors>
-            </Args>
-        </Behavior>
 	<Behavior>
 	  <Class>behaviors.Flasher</Class>
 	  <Args>
 	    <Id>flasher</Id>
 	  </Args>
 	</Behavior>
-
         <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
@@ -167,8 +109,7 @@
                     <Id>randmovement</Id>
                     <Id>ybounce</Id>
                     <Id>xbounce</Id>
-		    <!-- <Id>fadecolor</Id> -->
-		    <Id>flasher</Id>
+		            <Id>flasher</Id>
                 </ChainedBehaviors>
             </Args>
         </Behavior>
@@ -179,12 +120,6 @@
                 <Width>15</Width>
             </Args>
         </Behavior>
-        <Behavior Id="recursivedecay">
-            <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom>
-            <Args>
-                <InitialResponseCount>80</InitialResponseCount>
-            </Args>
-        </Behavior>
         <Behavior>
             <Class>behaviors.RandomWalk</Class>
             <Args>
@@ -192,17 +127,6 @@
                 <StepSize>20</StepSize>
             </Args>
         </Behavior>
-
-	<Behavior>
-	  <Class>behaviors.ModifyParam</Class>
-	  <Args>
-	    <Id>fadecolor</Id>
-            <ParamType>Sensor</ParamType>
-            <ParamName>Color</ParamName>
-            <ParamOp>[chan*.98 for chan in {val}]</ParamOp>
-	  </Args>
-	</Behavior>
-
         <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
@@ -226,36 +150,14 @@
                 <Id>mover</Id>
             </Args>
         </Behavior>
-        <Behavior Id="accelerate">
-            <InheritsFrom>behaviors/Accelerate.xml</InheritsFrom>
-        </Behavior>
         <Behavior>
             <Class>behaviors.EchoBehavior</Class>
             <Args>
                 <Id>echo</Id>
                 <z-index>0</z-index>
-		<Color>(90,90,90)</Color>
+	        	<Color>(90,90,90)</Color>
                 <RenderToScreen>False</RenderToScreen>
             </Args>
         </Behavior>
-        <Behavior>
-            <Class>behaviors.BehaviorChain</Class>
-            <Args>
-                <Id>mousechaser</Id>
-                <Inputs>
-                    <Id>followmouse</Id>
-                </Inputs>
-                <ChainedBehaviors>
-                    <Id>echo</Id>
-                    <Id>square</Id>
-                    <Id>singleframe</Id>
-                </ChainedBehaviors>
-                <RenderToScreen>True</RenderToScreen>
-            </Args>
-        </Behavior>
-
-        <Behavior Id="running">
-            <InheritsFrom>behaviors/RunningBehavior.xml</InheritsFrom>
-        </Behavior>
     </BehaviorConfiguration>
 </LightInstallation>
-- 
cgit v1.2.3