Big rename part 2: 'config' etc. to 'mapping.

[enjoyable.git] / Target.h

diff --git a/Target.h b/Target.h
index f7d4ec1..1a37f01 100644 (file)
--- a/Target.h
+++ b/Target.h
@@ -6,18 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@class NJInputController;
 
 @interface Target : NSObject
 
-@property (assign) float magnitude;
-@property (assign) BOOL running;
-@property (readonly) BOOL isContinuous;
+@property (nonatomic, assign) float magnitude;
+@property (nonatomic, assign) BOOL running;
+@property (nonatomic, readonly) BOOL isContinuous;
 
 - (void)trigger;
 - (void)untrigger;
-- (BOOL)update:(JoystickController *)jc;
-- (NSString*) stringify;
-+ (Target *)unstringify:(NSString*)str withConfigList:(NSArray*)configs;
+- (BOOL)update:(NJInputController *)jc;
+
+- (NSDictionary *)serialize;
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withMappings:(NSArray *)mappings;
++ (NSString *)serializationCode;
 
 @end