projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge device and mapping controllers into NJInputController.
[enjoyable.git]
/
Classes
/
NJOutput.h
diff --git
a/Classes/NJOutput.h
b/Classes/NJOutput.h
index
aeb8e46
..
52c0320
100644
(file)
--- a/
Classes/NJOutput.h
+++ b/
Classes/NJOutput.h
@@
-6,7
+6,7
@@
// Copyright 2009 University of Otago. All rights reserved.
//
// Copyright 2009 University of Otago. All rights reserved.
//
-@class NJ
Device
Controller;
+@class NJ
Input
Controller;
@interface NJOutput : NSObject
@interface NJOutput : NSObject
@@
-16,7
+16,7
@@
- (void)trigger;
- (void)untrigger;
- (void)trigger;
- (void)untrigger;
-- (BOOL)update:(NJ
Device
Controller *)jc;
+- (BOOL)update:(NJ
Input
Controller *)jc;
- (NSDictionary *)serialize;
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization;
- (NSDictionary *)serialize;
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization;