Merge branch 'fridaydemo' of github.com:rcoh/SmootLight into osc

Conflicts:
	behaviors/ControllerOSC.py

6 files changed, 152 insertions, 26 deletions

diff --git a/config/6thFloorOSC.xml b/config/6thFloorOSC.xml
index d3f0e6f..cb1fd10 100644
--- a/config/6thFloorOSC.xml
+++ b/config/6thFloorOSC.xml
@@ -40,6 +40,14 @@
         <InputElement>
             <Class>inputs.OSCInput</Class>
             <Args>
+                <Id>osc2</Id>
+                <Port>1234</Port>
+                <RefreshInterval>10</RefreshInterval>
+            </Args>
+        </InputElement>
+        <InputElement>
+            <Class>inputs.OSCInput</Class>
+            <Args>
                 <Id>osc</Id>
                 <Port>12345</Port>
                 <RefreshInterval>20</RefreshInterval>
@@ -52,14 +60,14 @@
                 <RefreshInterval>10</RefreshInterval>
             </Args>
         </InputElement>
-        <!--<InputElement>
+        <InputElement>
             <Class>inputs.TCPInput</Class>
             <Args>
                 <Id>tcp</Id>
                 <Port>20120</Port>
                 <RefreshInterval>10</RefreshInterval>
             </Args>
-        </InputElement>-->
+        </InputElement>
         <InputElement Id="followmouse">
             <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom>
         </InputElement>
@@ -71,13 +79,64 @@
         </InputElement>
     </InputConfiguration>
     <BehaviorConfiguration>
-        <Behavior>
-            <Class>behaviors.EchoBehavior</Class>
+    <Behavior>
+        <Class>behaviors.EchoBehavior</Class>
+        <Args>
+            <Id>echo</Id>
+            <z-index>0</z-index>
+            <RenderToScreen>False</RenderToScreen>
+        </Args>
+    </Behavior>
+    <Behavior>
+        <Class>behaviors.BehaviorChain</Class>
+        <Args>
+            <Id>moveanddecay</Id>
+            <Inputs>
+                <Id>tcp</Id>
+            </Inputs>
+            <ChainedBehaviors>
+                <Id>move</Id>
+                <Id>decay</Id>
+            </ChainedBehaviors>
+    <RenderToScreen>True</RenderToScreen>		
+            <Mapper>gaussmap</Mapper>
+        </Args>
+    </Behavior>
+    <Behavior>
+        <Class>behaviors.MoveBehavior</Class>
+        <Args>
+            <Id>move</Id>
+            <XStep>3</XStep>
+            <YStep>3</YStep>
+        </Args>
+    </Behavior>
+	<Behavior>
+	  <Class>behaviors.MobileShakeBehavior</Class>
+	  <Args>
+	    <Id>mobileshake</Id>
+	    <SizeMult>3</SizeMult>
+	  </Args>
+	</Behavior>
+	<Behavior>
+	  <Class>behaviors.BehaviorChain</Class>
+	  <Args>
+	    <Id>shakeanddecay</Id>
+	    <Inputs>
+	      <Id>tcp</Id>
+	    </Inputs>
+	    <ChainedBehaviors>
+	      <Id>mobileshake</Id>
+	      <Id>slowdecay</Id>
+	    </ChainedBehaviors>
+	    <RenderToScreen>True</RenderToScreen>
+	    <Mapper>simplemap</Mapper>
+	  </Args>
+	</Behavior>
+    <Behavior>
             <Args>
-                <Id>echo</Id>
-                <z-index>0</z-index>
-                <RenderToScreen>False</RenderToScreen>
+                <Id>sixaxis</Id>
             </Args>
+            <Class>behaviors.ControllerOSC</Class>
         </Behavior>
         <Behavior>
             <Args>
@@ -265,10 +324,24 @@
         <Behavior>
             <Class>behaviors.BehaviorChain</Class>
             <Args>
+                <Id>mousechaser2</Id>
+                <Inputs>
+                    <Id>osc2</Id>
+                </Inputs>
+                <ChainedBehaviors>
+                    <Id>sixaxis</Id>
+                    <Id>singleframe</Id>
+                </ChainedBehaviors>
+                <RenderToScreen>True</RenderToScreen>
+                <Mapper>gaussmap</Mapper>
+            </Args>
+        </Behavior>
+        <Behavior>
+            <Class>behaviors.BehaviorChain</Class>
+            <Args>
                 <Id>mousechaser</Id>
                 <Inputs>
                     <!--Id>followmouse</Id-->
-                    <Id>tcp</Id>
                     <Id>osc</Id>
                 </Inputs>
                 <ChainedBehaviors>
diff --git a/config/Jennifer.xml b/config/Jennifer.xml
index e6cfc40..179c462 100644
--- a/config/Jennifer.xml
+++ b/config/Jennifer.xml
@@ -98,6 +98,7 @@
                 <Id>colorbars</Id>
                 <Inputs>
                     <Id>pygamekey</Id>
+                    <Id>udp</Id>
                 </Inputs>
                 <ChainedBehaviors>
                     <Id>colorzones</Id>
diff --git a/config/Kuan.xml b/config/Kuan.xml
index c85cb75..7d76ed4 100644
--- a/config/Kuan.xml
+++ b/config/Kuan.xml
@@ -82,6 +82,15 @@
                 <Timeout>2000</Timeout>
             </Args>
         </Behavior>
+        <!--Behavior>
+            <Class>behaviors.ModifyParam</Class>
+            <Args>
+                <Id>swaposc</Id>
+                <ParamType>Sensor</ParamType>
+                <ParamName>Oscillate</ParamName>
+                <ParamOp>not {val}</ParamOp>
+            </Args>
+        </Behavior-->
         <Behavior>
             <Class>behaviors.MITDoors</Class>
             <Args>
diff --git a/config/MobileTest.xml b/config/MobileTest.xml
index af94c25..63c3b47 100644
--- a/config/MobileTest.xml
+++ b/config/MobileTest.xml
@@ -26,6 +26,16 @@
                 <Height>1</Height>
             </Args>
         </PixelMapper>
+        <PixelMapper>
+            <Class>pixelmappers.GaussianMapper</Class>
+            <Args>
+                <Id>mobilegaussmap</Id>
+                <CutoffDist>30</CutoffDist>
+                <MinWeight>0.1</MinWeight>
+                <Width>10</Width>
+                <Height>1</Height>
+            </Args>
+        </PixelMapper>
     </PixelMapperConfiguration>
     <RendererConfiguration>
         <Renderer>
@@ -227,26 +237,12 @@
                 </Inputs>
                 <ChainedBehaviors>
                     <Id>move</Id>
+		    <Id>mobileshake</Id>
                     <Id>decay</Id>
                 </ChainedBehaviors>
 		<RenderToScreen>True</RenderToScreen>		
-                <Mapper>gaussmap</Mapper>
+                <Mapper>mobilegaussmap</Mapper>
             </Args>
         </Behavior>
-	<Behavior>
-	  <Class>behaviors.BehaviorChain</Class>
-	  <Args>
-	    <Id>shakeanddecay</Id>
-	    <Inputs>
-	      <Id>tcp</Id>
-	    </Inputs>
-	    <ChainedBehaviors>
-	      <Id>mobileshake</Id>
-	      <Id>slowdecay</Id>
-	    </ChainedBehaviors>
-	    <RenderToScreen>True</RenderToScreen>
-	    <Mapper>simplemap</Mapper>
-	  </Args>
-	</Behavior>
     </BehaviorConfiguration>
 </LightInstallation>
diff --git a/config/SmootWindTest.xml b/config/SmootWindTest.xml
index 6b74450..f6e7a97 100755
--- a/config/SmootWindTest.xml
+++ b/config/SmootWindTest.xml
@@ -53,6 +53,14 @@
                 <RefreshInterval>1</RefreshInterval>

             </Args>

         </InputElement>

+        <InputElement>

+            <Class>inputs.PygameInput</Class>

+            <Args>

+                <Id>pygamekey</Id>

+                <RefreshInterval>10</RefreshInterval>

+                <Keyboard>True</Keyboard>

+            </Args>

+        </InputElement>

 	<InputElement>

 	  <Class>inputs.HTMLInput</Class>

 	  <Args>

@@ -141,8 +149,8 @@
 	    <Args>

 		<Id>smootwind</Id>		

 		<Inputs>

-		  <Id>weatherinput</Id>

-	    	</Inputs>		

+          <Id>pygamekey</Id>

+	    </Inputs>		

 	    </Args>

 	</Behavior>

         <Behavior>

diff --git a/config/SynchTest.xml b/config/SynchTest.xml
new file mode 100644
index 0000000..fcb8293
--- /dev/null
+++ b/config/SynchTest.xml
@@ -0,0 +1,39 @@
+<!---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>
+    </PixelMapperConfiguration>
+    <RendererConfiguration>
+        <Renderer>
+            <InheritsFrom>renderers/60StripSeq.xml</InheritsFrom>
+        </Renderer>
+        <Renderer>
+            <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
+        </Renderer>
+    </RendererConfiguration>
+    <InputConfiguration>
+    </InputConfiguration>
+    <BehaviorConfiguration>
+        <Behavior>
+            <Class>behaviors.SynchTest</Class>
+            <Args>
+                <Id>synch</Id>
+                <RenderToScreen>True</RenderToScreen>
+            </Args>
+        </Behavior>
+    </BehaviorConfiguration>
+</LightInstallation>