From b2805409566af00bc15639494f5a186fbd2f16e6 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 20:15:42 +0000 Subject: More indenting changes --- nGenEx/MultiController.h | 90 ++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'nGenEx/MultiController.h') diff --git a/nGenEx/MultiController.h b/nGenEx/MultiController.h index a65ae85..fa496ef 100644 --- a/nGenEx/MultiController.h +++ b/nGenEx/MultiController.h @@ -1,15 +1,15 @@ /* Project nGenEx - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: nGenEx.lib - FILE: MultiController.h - AUTHOR: John DiCamillo + SUBSYSTEM: nGenEx.lib + FILE: MultiController.h + AUTHOR: John DiCamillo - OVERVIEW - ======== - ComboController Motion Controller class + OVERVIEW + ======== + ComboController Motion Controller class */ #ifndef MultiController_h @@ -22,46 +22,46 @@ class MultiController : public MotionController { public: - static const char* TYPENAME() { return "MultiController"; } - - MultiController(); - virtual ~MultiController(); - - virtual void AddController(MotionController* c); - virtual void MapKeys(KeyMapEntry* mapping, int nkeys); - virtual void SwapYawRoll(int swap); - virtual int GetSwapYawRoll() const; - - // sample the physical device - virtual void Acquire(); - - // translations - virtual double X() { return x; } - virtual double Y() { return y; } - virtual double Z() { return z; } - - // rotations - virtual double Pitch() { return p; } - virtual double Roll() { return r; } - virtual double Yaw() { return w; } - virtual int Center() { return c; } - - // throttle - virtual double Throttle() { return t; } - virtual void SetThrottle(double throttle); - - // actions - virtual int Action(int n) { return action[n]; } - virtual int ActionMap(int n); + static const char* TYPENAME() { return "MultiController"; } + + MultiController(); + virtual ~MultiController(); + + virtual void AddController(MotionController* c); + virtual void MapKeys(KeyMapEntry* mapping, int nkeys); + virtual void SwapYawRoll(int swap); + virtual int GetSwapYawRoll() const; + + // sample the physical device + virtual void Acquire(); + + // translations + virtual double X() { return x; } + virtual double Y() { return y; } + virtual double Z() { return z; } + + // rotations + virtual double Pitch() { return p; } + virtual double Roll() { return r; } + virtual double Yaw() { return w; } + virtual int Center() { return c; } + + // throttle + virtual double Throttle() { return t; } + virtual void SetThrottle(double throttle); + + // actions + virtual int Action(int n) { return action[n]; } + virtual int ActionMap(int n); protected: - int nctrl; - MotionController* ctrl[4]; + int nctrl; + MotionController* ctrl[4]; - double x,y,z,p,r,w,t; - double p1, r1, w1; - int c; - int action[MotionController::MaxActions]; + double x,y,z,p,r,w,t; + double p1, r1, w1; + int c; + int action[MotionController::MaxActions]; }; #endif // MultiController_h -- cgit v1.1