X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputMouseMove.m;h=09185932a057d7632af42dd1d8296c4472377346;hp=85919236dce008566c2e632d4717f1dca115c73c;hb=281e575060f936fd9483d1cf6416851b3783fe42;hpb=b14d8429658dd6f3f7b4904301031addb502b22c

diff --git a/Classes/NJOutputMouseMove.m b/Classes/NJOutputMouseMove.m
index 8591923..0918593 100644
--- a/Classes/NJOutputMouseMove.m
+++ b/Classes/NJOutputMouseMove.m
@@ -7,7 +7,7 @@
 
 #import "NJOutputMouseMove.h"
 
-#import "NJDeviceController.h"
+#import "NJInputController.h"
 
 @implementation NJOutputMouseMove
 
@@ -22,8 +22,7 @@
               };
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
-                  withMappings:(id <NSFastEnumeration>)mappings {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     NJOutputMouseMove *output = [[NJOutputMouseMove alloc] init];
     output.axis = [serialization[@"axis"] intValue];
     output.speed = [serialization[@"speed"] floatValue];
@@ -38,7 +37,7 @@
 
 #define CLAMP(a, l, h) MIN(h, MAX(a, l))
 
-- (BOOL)update:(NJDeviceController *)jc {
+- (BOOL)update:(NJInputController *)ic {
     if (self.magnitude < 0.05)
         return NO; // dead zone
     
@@ -59,10 +58,10 @@
             dy = self.magnitude * _speed;
             break;
     }
-    NSPoint mouseLoc = jc.mouseLoc;
+    NSPoint mouseLoc = ic.mouseLoc;
     mouseLoc.x = CLAMP(mouseLoc.x + dx, 0, size.width - 1);
     mouseLoc.y = CLAMP(mouseLoc.y - dy, 0, size.height - 1);
-    jc.mouseLoc = mouseLoc;
+    ic.mouseLoc = mouseLoc;
     
     CGEventRef move = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved,
                                               CGPointMake(mouseLoc.x, size.height - mouseLoc.y),