Show an error message if opening input devices fail. Move real vs. configuration...

[enjoyable.git] / Target.h

diff --git a/Target.h b/Target.h
index 43b7d0c..93b181f 100644 (file)
--- a/Target.h
+++ b/Target.h
@@ -6,21 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@class JoystickController;
 
-@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;
--(void) update: (JoystickController *)jc;
--(NSString*) stringify;
-+(Target*) unstringify: (NSString*) str withConfigList: (NSArray*) configs;
+@property (assign) float magnitude;
+@property (assign) BOOL running;
+@property (readonly) BOOL isContinuous;
+
+- (void)trigger;
+- (void)untrigger;
+- (BOOL)update:(JoystickController *)jc;
+
+- (NSDictionary *)serialize;
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withConfigs:(NSArray *)configs;
++ (NSString *)serializationCode;
 
 @end