X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Target.h;h=df3535b7176b8c35973f008b5e6d07a4e536268f;hp=215245ffd6d4b3ceec1d53e990de6161d47cf953;hb=19f40be5b645e44ffb55bdce0b6cc5c5615f68e7;hpb=530009447c5bbd360ac5023979cffc6d32a28df3

diff --git a/Target.h b/Target.h
index 215245f..df3535b 100644
--- a/Target.h
+++ b/Target.h
@@ -6,18 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@class JoystickController;
 
-@interface Target : NSObject {
-	BOOL running;
-    int inputValue;
-}
+@interface Target : NSObject
 
-@property(readwrite) BOOL running;
-@property(readwrite) int inputValue;
--(void) trigger;
--(void) untrigger;
--(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:(JoystickController *)jc;
+
+- (NSDictionary *)serialize;
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withConfigs:(NSArray *)configs;
++ (NSString *)serializationCode;
 
 @end