diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-27 17:21:28 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-27 17:21:28 -0500 |
| commit | 4fbb65efee8a214d9a35395e46c582f251ea2a35 (patch) | |
| tree | 35fc0b137274708d9ccfa7a29b3e7180afa1bda4 /behaviors | |
| parent | 890e167b2cd2a438f81a759833fc4f1c876c4142 (diff) | |
| parent | 328464219a02c014caf1608a27a898900cad8456 (diff) | |
Merge branch 'mobileapp'
Diffstat (limited to 'behaviors')
| -rw-r--r-- | behaviors/MobileShakeBehavior.py | 17 | ||||
| -rw-r--r-- | behaviors/MoveBehavior.py | 16 |
2 files changed, 27 insertions, 6 deletions
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 d2f60a0..e504ca9 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): """Moves current location by the x and y components of sensorInput. Uses recurrences to track @@ -18,9 +18,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) |