X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSActionHat.m;h=2cac39c77c4a22e4148be01fe6e78c52d6a82540;hp=13abcda9d3958a72d347525ad566261345d555fa;hb=0238d141f06420e1a73eccd14ca73a7e29ad2a69;hpb=5a79f9f05829ca1aecc70aeadb8c980ec4f3556d

diff --git a/JSActionHat.m b/JSActionHat.m
index 13abcda..2cac39c 100644
--- a/JSActionHat.m
+++ b/JSActionHat.m
@@ -5,86 +5,92 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "JSActionHat.h"
+
 static BOOL active_eightway[36] = {
-NO,  NO,  NO,  NO , // center
-YES, NO,  NO,  NO , // N
-YES, NO,  NO,  YES, // NE
-NO,  NO,  NO,  YES, // E
-NO,  YES, NO,  YES, // SE
-NO,  YES, NO,  NO , // S
-NO,  YES, YES, NO , // SW
-NO,  NO,  YES, NO , // W
-YES, NO,  YES, NO , // NW
+    NO,  NO,  NO,  NO , // center
+    YES, NO,  NO,  NO , // N
+    YES, NO,  NO,  YES, // NE
+    NO,  NO,  NO,  YES, // E
+    NO,  YES, NO,  YES, // SE
+    NO,  YES, NO,  NO , // S
+    NO,  YES, YES, NO , // SW
+    NO,  NO,  YES, NO , // W
+    YES, NO,  YES, NO , // NW
 };
+
 static BOOL active_fourway[20] = {
-NO,  NO,  NO,  NO , // center
-YES, NO,  NO,  NO , // N
-NO,  NO,  NO,  YES, // E
-NO,  YES, NO,  NO , // S
-NO,  NO,  YES, NO , // W
+    NO,  NO,  NO,  NO , // center
+    YES, NO,  NO,  NO , // N
+    NO,  NO,  NO,  YES, // E
+    NO,  YES, NO,  NO , // S
+    NO,  NO,  YES, NO , // W
 };
 
 @implementation JSActionHat
 
-- (id) init {
-	if(self = [super init]) {
-		subActions = @[[[SubAction alloc] initWithIndex: 0 name: @"Up" base: self],
-					  [[SubAction alloc] initWithIndex: 1 name: @"Down" base: self],
-					  [[SubAction alloc] initWithIndex: 2 name: @"Left" base: self],
-					  [[SubAction alloc] initWithIndex: 3 name: @"Right" base: self]];
-		name = @"Hat switch";
-	}
-	return self;
+- (id)initWithIndex:(int)index {
+    if ((self = [super init])) {
+        self.children = @[[[JSAction alloc] initWithName:@"Up" base:self],
+                          [[JSAction alloc] initWithName:@"Down" base:self],
+                          [[JSAction alloc] initWithName:@"Left" base:self],
+                          [[JSAction alloc] initWithName:@"Right" base:self]];
+        self.name = [NSString stringWithFormat:@"Hat Switch %d", index];
+    }
+    return self;
 }
 
--(id) findSubActionForValue: (IOHIDValueRef) value {
-	int parsed = IOHIDValueGetIntegerValue(value);
-	if(IOHIDElementGetLogicalMax(IOHIDValueGetElement(value)) == 7) {
-		// 8-way
-		switch(parsed) {
-			case 0: return subActions[0];
-			case 4: return subActions[1];
-			case 6: return subActions[2];
-			case 2: return subActions[3];
-		}
-	} else 	if(IOHIDElementGetLogicalMax(IOHIDValueGetElement(value)) == 8) {
-		// 8-way
-		switch(parsed) {
-			case 1: return subActions[0];
-			case 5: return subActions[1];
-			case 7: return subActions[2];
-			case 3: return subActions[3];
-		}
-	} else if(IOHIDElementGetLogicalMax(IOHIDValueGetElement(value)) == 3) {
-			// 4-way
-		switch(parsed) {
-			case 0: return subActions[0];
-			case 2: return subActions[1];
-			case 3: return subActions[2];
-			case 1: return subActions[3];
-		}
-	} else if(IOHIDElementGetLogicalMax(IOHIDValueGetElement(value)) == 4) {
-		// 4-way
-		switch(parsed) {
-			case 1: return subActions[0];
-			case 3: return subActions[1];
-			case 4: return subActions[2];
-			case 2: return subActions[3];
-		}
-	}
-	return NULL;
+- (id)findSubActionForValue:(IOHIDValueRef)value {
+    long parsed = IOHIDValueGetIntegerValue(value);
+    switch (IOHIDElementGetLogicalMax(IOHIDValueGetElement(value))) {
+        case 7: // 8-way switch, 0-7.
+            switch (parsed) {
+                case 0: return self.children[0];
+                case 4: return self.children[1];
+                case 6: return self.children[2];
+                case 2: return self.children[3];
+                default: return nil;
+            }
+        case 8: // 8-way switch, 1-8 (neutral 0).
+            switch (parsed) {
+                case 1: return self.children[0];
+                case 5: return self.children[1];
+                case 7: return self.children[2];
+                case 3: return self.children[3];
+                default: return nil;
+            }
+        case 3: // 4-way switch, 0-3.
+            switch (parsed) {
+                case 0: return self.children[0];
+                case 2: return self.children[1];
+                case 3: return self.children[2];
+                case 1: return self.children[3];
+                default: return nil;
+            }
+        case 4: // 4-way switch, 1-4 (neutral 0).
+            switch (parsed) {
+                case 1: return self.children[0];
+                case 3: return self.children[1];
+                case 4: return self.children[2];
+                case 2: return self.children[3];
+                default: return nil;
+            }
+        default:
+            return nil;
+    }
 }
 
--(void) notifyEvent: (IOHIDValueRef) value {
-	int parsed = IOHIDValueGetIntegerValue(value);
-	int size = IOHIDElementGetLogicalMax(IOHIDValueGetElement(value));
-	if(size == 7 || size == 3) {
-		parsed++;
-		size++;
-	}
-	BOOL* activeSubactions = (size == 8) ? active_eightway : active_fourway;
-	for(int i=0; i<4; i++)
-		[subActions[i] setActive: activeSubactions[parsed * 4 + i]];
+- (void)notifyEvent:(IOHIDValueRef)value {
+    long parsed = IOHIDValueGetIntegerValue(value);
+    long size = IOHIDElementGetLogicalMax(IOHIDValueGetElement(value));
+    // Skip first row in table if 0 is not neutral.
+    if (size & 1) {
+        parsed++;
+        size++;
+    }
+    BOOL *activechildren = (size == 8) ? active_eightway : active_fourway;
+    for (int i = 0; i < 4; i++)
+        [self.children[i] setActive:activechildren[parsed * 4 + i]];
 }
 
 @end