projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big rename part 1: 'action' to 'input'.
[enjoyable.git]
/
TargetMouseMove.m
diff --git
a/TargetMouseMove.m
b/TargetMouseMove.m
index
78d9c93
..
2806827
100644
(file)
--- a/
TargetMouseMove.m
+++ b/
TargetMouseMove.m
@@
-3,55
+3,60
@@
// Enjoy
//
// Created by Yifeng Huang on 7/26/12.
// Enjoy
//
// Created by Yifeng Huang on 7/26/12.
-// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
//
#import "TargetMouseMove.h"
//
#import "TargetMouseMove.h"
-@implementation TargetMouseMove
+#import "NJInputController.h"
-
-(BOOL) isContinuous
{
-
return true
;
+
@implementation TargetMouseMove
{
+
int sign
;
}
}
-@synthesize dir;
-
--(NSString*) stringify {
- return [[NSString alloc] initWithFormat: @"mmove~%d", dir];
+-(BOOL) isContinuous {
+ return YES;
}
}
-+(TargetMouseMove*) unstringifyImpl: (NSArray*) comps {
- NSParameterAssert([comps count] == 2);
- TargetMouseMove* target = [[TargetMouseMove alloc] init];
- [target setDir: [comps[1] integerValue]];
- return target;
++ (NSString *)serializationCode {
+ return @"mmove";
}
}
--
(void) trigger: (JoystickController *)jc
{
- return;
+-
(NSDictionary *)serialize
{
+ return
@{ @"type": @"mmove", @"axis": @(_axis) }
;
}
}
--(void) untrigger: (JoystickController *)jc {
- return;
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+ withConfigs:(NSArray *)configs {
+ TargetMouseMove *target = [[TargetMouseMove alloc] init];
+ target.axis = [serialization[@"axis"] intValue];
+ return target;
}
}
-- (BOOL)update:(
Joystick
Controller *)jc {
- //printf("Dir %d inputValue %f\n", [self dir], [self inputValue]);
- if (fabs([self inputValue]) < 0.01)
+- (BOOL)update:(
NJInput
Controller *)jc {
+ if (fabsf(self.magnitude) < 0.01) {
+ sign = 0;
return NO; // dead zone
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;
+ }
- NSRect screenRect = [[NSScreen mainScreen] frame];
- NSInteger height = screenRect.size.height;
+ CGFloat height = NSScreen.mainScreen.frame.size.height;
// TODO
// TODO
-
double speed = 4.0
;
- if (
[jc frontWindowOnly]
)
- speed = 12.
0
;
-
double dx = 0.0, dy = 0.0
;
- if (
[self dir]
== 0)
- dx =
[self inputValue]
* speed;
+
float speed = 4.f
;
+ if (
jc.frontWindowOnly
)
+ speed = 12.
f
;
+
float dx = 0.f, dy = 0.f
;
+ if (
_axis
== 0)
+ dx =
self.magnitude
* speed;
else
else
- dy =
[self inputValue]
* speed;
+ dy =
self.magnitude
* speed;
NSPoint mouseLoc = jc.mouseLoc;
mouseLoc.x += dx;
mouseLoc.y -= dy;
NSPoint mouseLoc = jc.mouseLoc;
mouseLoc.x += dx;
mouseLoc.y -= dy;
@@
-61,10
+66,10
@@
CGPointMake(mouseLoc.x, height - mouseLoc.y),
0);
CGEventSetType(move, kCGEventMouseMoved);
CGPointMake(mouseLoc.x, height - mouseLoc.y),
0);
CGEventSetType(move, kCGEventMouseMoved);
- CGEventSetIntegerValueField(move, kCGMouseEventDeltaX, dx);
- CGEventSetIntegerValueField(move, kCGMouseEventDeltaY, dy);
+ CGEventSetIntegerValueField(move, kCGMouseEventDeltaX,
(int)
dx);
+ CGEventSetIntegerValueField(move, kCGMouseEventDeltaY,
(int)
dy);
- if (
[jc frontWindowOnly]
) {
+ if (
jc.frontWindowOnly
) {
ProcessSerialNumber psn;
GetFrontProcess(&psn);
CGEventPostToPSN(&psn, move);
ProcessSerialNumber psn;
GetFrontProcess(&psn);
CGEventPostToPSN(&psn, move);
@@
-74,7
+79,7
@@
}
CFRelease(move);
}
CFRelease(move);
- return
dx || dy
;
+ return
YES
;
}
@end
}
@end