Changeset 20689
- Timestamp:
- 08/10/07 22:06:43 (9 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveWrapper.h
r19958 r20689 37 37 #include <gadget/Type/Digital.h> 38 38 #include <gadget/Type/InputMixer.h> 39 #include <gadget/Type/InputBaseTypes.h> 39 40 #include <drivers/EssentialReality/P5Glove/P5GloveStandalone.h> 40 41 … … 46 47 * Software interface to EssentialReality P5glove hardware. 47 48 */ 48 class P5GloveWrapper :49 public InputMixer<InputMixer<InputMixer<Input, Digital>, Analog>, Position>49 class P5GloveWrapper 50 : public input_glove_digital_analog_position_t 50 51 { 51 52 public: juggler/branches/2.2/modules/gadgeteer/gadget/Type/BaseTypeFactory.cpp
r20602 r20689 98 98 REGISTER_CONSTRUCTOR_TYPE(input_analog_position_t); 99 99 REGISTER_CONSTRUCTOR_TYPE(input_glove_digital_t); 100 REGISTER_CONSTRUCTOR_TYPE(input_glove_digital_analog_position_t); 100 101 REGISTER_CONSTRUCTOR_TYPE(input_digital_analog_position_t); 101 102 REGISTER_CONSTRUCTOR_TYPE(siminput_input_position); juggler/branches/2.2/modules/gadgeteer/gadget/Type/InputBaseTypes.h
r20602 r20689 71 71 typedef InputMixer< InputMixer<Input, Analog>, Position> input_analog_position_t; 72 72 typedef InputMixer< InputMixer<Input, Glove>, Digital> input_glove_digital_t; 73 typedef InputMixer< InputMixer< InputMixer< InputMixer<Input, Glove>, Digital>, Analog>, Position> input_glove_digital_analog_position_t; 73 74 typedef InputMixer< InputMixer< InputMixer<Input, Digital>, Analog>, Position> input_digital_analog_position_t; 74 75 typedef InputMixer< InputMixer<SimInput, Input>, Position> siminput_input_position;
