From 328464219a02c014caf1608a27a898900cad8456 Mon Sep 17 00:00:00 2001
From: eugue <eug.sun@gmail.com>
Date: Thu, 27 Jan 2011 14:28:20 -0500
Subject: mobile shake behavior added.

---
 behaviors/MobileShakeBehavior.py | 17 +++++++++++++++++
 behaviors/MoveBehavior.py        | 16 ++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 behaviors/MobileShakeBehavior.py

(limited to 'behaviors')

diff --git a/behaviors/MobileShakeBehavior.py b/behaviors/MobileShakeBehavior.py
new file mode 100644
index 0000000..e25e929
--- /dev/null
+++ b/behaviors/MobileShakeBehavior.py
@@ -0,0 +1,17 @@
+from operationscore.Behavior import *
+import util.Strings as Strings
+
+class MobileShakeBehavior(Behavior):
+    def processResponse(self, sensorInputs, recursiveInputs):
+        #print sensorInputs
+        ret = []
+        for sInput in sensorInputs:
+            outDict = dict(sInput)
+            if 'type' in sInput and sInput['type'] == 2:
+                outDict['Location'] = '{x}>' + str(0) + ',{y}>' + str(0)
+                outDict['Color'] = [sInput['r'], sInput['g'], sInput['b']]
+            else: # dumb invisible pixel
+                outDict['Location'] = (-1, -1)
+                outDict['Color'] = [0, 0, 0]
+            ret.append(outDict)
+        return (ret, recursiveInputs)
diff --git a/behaviors/MoveBehavior.py b/behaviors/MoveBehavior.py
index 590f0e4..be41b52 100644
--- a/behaviors/MoveBehavior.py
+++ b/behaviors/MoveBehavior.py
@@ -1,7 +1,7 @@
 from operationscore.Behavior import *
-import util.ComponentRegistry as compReg
-import util.Geo as Geo
-import util.Strings as Strings
+#import util.ComponentRegistry as compReg
+#import util.Geo as Geo
+#import util.Strings as Strings
 
 class MoveBehavior(Behavior):
     def processResponse(self, sensorInputs, recursiveInputs):
@@ -15,9 +15,13 @@ class MoveBehavior(Behavior):
             for currRecLoc in currRecLocs:
                 currDict = dict(currRecLoc)
                 for sensorInput in sensorInputs:
-                    currDict['Location'] = (currDict['Location'][0] - sensorInput['x'] * self['XStep'], \
-                                            currDict['Location'][1] + sensorInput['y'] * self['YStep'])
-                    currDict['Color'] = [sensorInput['r'], sensorInput['g'], sensorInput['b']]
+                    if 'type' in sensorInput and sensorInput['type'] == 1:
+                        currDict['Location'] = (currDict['Location'][0] - sensorInput['x'] * self['XStep'], \
+                                                currDict['Location'][1] + sensorInput['y'] * self['YStep'])
+                        currDict['Color'] = [sensorInput['r'], sensorInput['g'], sensorInput['b']]
+                    #elif sensorInput['type'] == 2:
+                    #    currDict['Shake'] = 1
+                    #    currDict['Force'] = sensorInput['force']
                 ret.append(currDict)
             #print ret
             return (ret, ret)
-- 
cgit v1.2.3