From bd1119e82ff9f4bd8835ed6d3934f156a6da8b23 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Fri, 28 Jan 2011 16:24:21 -0500
Subject: Fixed TCPInput bug.

---
 config/6thFloorOSC.xml | 67 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 11 deletions(-)

(limited to 'config')

diff --git a/config/6thFloorOSC.xml b/config/6thFloorOSC.xml
index 2215688..aa7a07d 100644
--- a/config/6thFloorOSC.xml
+++ b/config/6thFloorOSC.xml
@@ -60,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>
@@ -79,15 +79,60 @@
         </InputElement>
     </InputConfiguration>
     <BehaviorConfiguration>
-        <Behavior>
-            <Class>behaviors.EchoBehavior</Class>
-            <Args>
-                <Id>echo</Id>
-                <z-index>0</z-index>
-                <RenderToScreen>False</RenderToScreen>
-            </Args>
-        </Behavior>
-        <Behavior>
+    <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>sixaxis</Id>
             </Args>
-- 
cgit v1.2.3