projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show an error message if opening input devices fail. Move real vs. configuration...
[enjoyable.git]
/
TargetMouseMove.m
diff --git
a/TargetMouseMove.m
b/TargetMouseMove.m
index 8eeae88d3dfae9b3e2a240bc85f908ecafaddf3d..d2bc94307d1a2e9aa62960ad92865348f02eed3e 100644
(file)
--- a/
TargetMouseMove.m
+++ b/
TargetMouseMove.m
@@
-10,7
+10,9
@@
#import "JoystickController.h"
#import "JoystickController.h"
-@implementation TargetMouseMove
+@implementation TargetMouseMove {
+ int sign;
+}
-(BOOL) isContinuous {
return true;
-(BOOL) isContinuous {
return true;
@@
-34,19
+36,28
@@
}
- (BOOL)update:(JoystickController *)jc {
}
- (BOOL)update:(JoystickController *)jc {
- //printf("Dir %d inputValue %f\n", [self dir], [self inputValue]);
- if (fabs(self.magnitude) < 0.01)
+ if (fabsf(self.magnitude) < 0.01) {
+ sign = 0;
return NO; // dead zone
return NO; // dead zone
+ }
+
+ // If the action 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;
// TODO
NSRect screenRect = [[NSScreen mainScreen] frame];
NSInteger height = screenRect.size.height;
// TODO
- float speed = 4.
0
;
+ float speed = 4.
f
;
if ([jc frontWindowOnly])
if ([jc frontWindowOnly])
- speed = 12.
0
;
- float dx = 0.
0, dy = 0.0
;
- if (
[self dir]
== 0)
+ speed = 12.
f
;
+ float dx = 0.
f, dy = 0.f
;
+ if (
self.dir
== 0)
dx = self.magnitude * speed;
else
dy = self.magnitude * speed;
dx = self.magnitude * speed;
else
dy = self.magnitude * speed;
@@
-72,7
+83,7
@@
}
CFRelease(move);
}
CFRelease(move);
- return
dx || dy
;
+ return
YES
;
}
@end
}
@end