X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetMouseScroll.m;h=8f87c02e32557ee7d0b99a2e2c20dc03b580b177;hp=4d6f409a97d2804765f74109447c2c3642837763;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=16a7c0a04bd05f4012d5a97a53520802969cfc86

diff --git a/TargetMouseScroll.m b/TargetMouseScroll.m
index 4d6f409..8f87c02 100644
--- a/TargetMouseScroll.m
+++ b/TargetMouseScroll.m
@@ -3,36 +3,67 @@
 //  Enjoy
 //
 //  Created by Yifeng Huang on 7/28/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
 #import "TargetMouseScroll.h"
 
-@implementation TargetMouseScroll
-
-@synthesize amount;
+@implementation TargetMouseScroll {
+    int sign;
+}
 
 + (NSString *)serializationCode {
     return @"mscroll";
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"mscroll", @"amount": @(self.amount) };
+    return @{ @"type": @"mscroll", @"amount": @(_amount) };
 }
 
 + (Target *)targetDeserialize:(NSDictionary *)serialization
-                  withConfigs:(NSArray *)configs {
+                  withMappings:(NSArray *)mappings {
 	TargetMouseScroll *target = [[TargetMouseScroll alloc] init];
     target.amount = [serialization[@"amount"] intValue];
 	return target;
 }
--(void) trigger {
+
+- (void)trigger {
+    if (!self.magnitude) {
+        CGEventRef scroll = CGEventCreateScrollWheelEvent(NULL,
+                                                          kCGScrollEventUnitLine,
+                                                          1,
+                                                          _amount);
+        CGEventPost(kCGHIDEventTap, scroll);
+        CFRelease(scroll);
+    }
+}
+
+- (BOOL)update:(NJInputController *)jc {
+    if (fabsf(self.magnitude) < 0.01f) {
+        sign = 0;
+        return NO; // dead zone
+    }
+    
+    // If the input crossed over High/Low, this target is done.
+    if (!sign)
+        sign = self.magnitude < 0 ? -1 : 1;
+    else if (sign / self.magnitude < 0) {
+        sign = 0;
+        return NO;
+    }
+
+    int amount = (int)(16.f * fabsf(self.magnitude) * _amount);
     CGEventRef scroll = CGEventCreateScrollWheelEvent(NULL,
-                                                      kCGScrollEventUnitLine,
+                                                      kCGScrollEventUnitPixel,
                                                       1,
-                                                      self.amount);
+                                                      amount);
     CGEventPost(kCGHIDEventTap, scroll);
     CFRelease(scroll);
+
+    return YES;
+}
+
+- (BOOL)isContinuous {
+    return YES;
 }
 
 @end