X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Target.h;h=1a37f01e81d90b7c9e6d75b84d63ced72478530e;hp=51470bfcd7f089f18945725f0c6cc2b7315e041b;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=724979785b445dcba8a9861c2531ae0308bdf40a

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