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

Conflicts:
	behaviors/ControllerOSC.py

1 files changed, 17 insertions, 7 deletions

diff --git a/behaviors/SmootWind.py b/behaviors/SmootWind.py
index 347e2fc..804183c 100755
--- a/behaviors/SmootWind.py
+++ b/behaviors/SmootWind.py
@@ -22,12 +22,22 @@ class SmootWind(Behavior):
         for sensory in sensorInputs:

             print sensory

             # input[0] is windspeed, [1] is dir

-            windSpeed = sensory[0]

-            windDir = sensory[1]

+	    if 0 in sensory and 1 in sensory:

+		    windSpeed = sensory[0]

+		    windDir = sensory[1]

+		    #print self.mapper.argDict

+		    self.mapper.argDict['Width'] = self.mapper.argDict['Width']+float(windSpeed)*2+20

+		    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']+float(windSpeed)*3+10*random.random(); 

+		    #print 'Width: ' + str(self.mapper.argDict['Width'])

+		    #print 'xFor: ' + str(self.xFor.argDict['ParamOp'])

+

+	    elif 'Key' in sensory:

+		    if sensory['Key'] == 273:

+			    self.mapper.argDict['Width'] = self.mapper.argDict['Width']+10;

+			    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']+5;

+		   

+		    elif sensory['Key'] == 274:

+			    self.mapper.argDict['Width'] = self.mapper.argDict['Width']-10;

+			    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']-5;

 

-            #print self.mapper.argDict

-            self.mapper.argDict['Width'] = float(windSpeed)*2+20

-            self.xFor.argDict['ParamOp'] = float(windSpeed)*3+10*random.random(); 

-            #print 'Width: ' + str(self.mapper.argDict['Width'])

-            #print 'xFor: ' + str(self.xFor.argDict['ParamOp'])

         return (sensorInputs, recursiveInputs)