Navigation

Changeset 20602

Timestamp:

07/27/07 19:38:38 (1 year ago)

Author:

patrick

Message:

MFT r20601: Make sim devices use pre-defined input base types.

Files:

r19729	r20602
33	33
34	34	#include <jccl/Config/ConfigElementPtr.h>
	35	#include <gadget/Type/InputBaseTypes.h>
35	36	#include <gadget/Type/Input.h>
36	37	#include <gadget/Type/Analog.h>
37	38	#include <gadget/Devices/Sim/SimInput.h>
38		~~#include <gadget/Type/InputMixer.h>~~
39	39
40	40
…	…
50	50	* This class should not be used directly by the user.
51	51	*/
52		//class SimAnalog : public Input, public Analog, public SimInput
53		class SimAnalog : public InputMixer<InputMixer<SimInput,Input>,Analog>
	52	class SimAnalog
	53	: public siminput_input_analog
54	54	{
55	55	public:

r19729	r20602
31	31	#include <gadget/gadgetConfig.h>
32	32	#include <vector>
	33	#include <gadget/Type/InputBaseTypes.h>
33	34	#include <gadget/Type/Input.h>
34	35	#include <gadget/Type/Digital.h>
35	36	#include <gadget/Devices/Sim/SimInput.h>
36		~~#include <gadget/Type/InputMixer.h>~~
37	37
38	38	namespace gadget
…	…
51	51	*/
52	52	//class SimDigital : public Input, public Digital, public SimInput
53		class SimDigital : public InputMixer<InputMixer<SimInput,Input>,Digital>
	53	class SimDigital
	54	: public siminput_input_digital
54	55	{
55	56	public:

r19729	r20602
31	31	#include <vector>
32	32
	33	#include <gadget/Type/InputBaseTypes.h>
33	34	#include <gadget/Type/Input.h>
34	35	#include <gadget/Type/Digital.h>
35	36	#include <gadget/Type/Glove.h>
36		~~#include <gadget/Type/InputMixer.h>~~
37	37
38	38	#include <gadget/Devices/Sim/SimInput.h>
…	…
52	52	* This class should not be used directly by the user.
53	53	*/
54		class SimDigitalGlove : virtual public InputMixer< InputMixer< InputMixer<Input,Digital>, SimInput>, Glove>
	54	class SimDigitalGlove
	55	: public siminput_input_digital_glove_t
55	56	{
56	57	public:

r19729	r20602
30	30
31	31	#include <gadget/gadgetConfig.h>
	32	#include <gadget/Type/InputBaseTypes.h>
32	33	#include <gadget/Type/Input.h>
33	34	#include <gadget/Devices/Sim/SimInput.h>
34	35	#include <gadget/Type/Position.h>
35		~~#include <gadget/Type/InputMixer.h>~~
36	36	#include <gmtl/Vec.h>
37	37
…	…
45	45	* This class should not be accessed directly by the user.
46	46	*/
47		~~//class SimPosition : public SimInput, public Input, public~~ Position
48		class SimPosition : public InputMixer<InputMixer<SimInput,Input>,Position>
	47	class SimPosition
	48	: public siminput_input_position
49	49	{
50	50	public:

r19729	r20602
29	29
30	30	#include <gadget/gadgetConfig.h>
	31	#include <gadget/Type/InputBaseTypes.h>
31	32	#include <gadget/Type/Input.h>
32	33	#include <gadget/Type/Position.h>
33	34	#include <gadget/Type/PositionInterface.h>
34		~~#include <gadget/Type/InputMixer.h>~~
35	35	#include <jccl/Config/ConfigElementPtr.h>
36	36
…	…
48	48	* @note This class should not be used directly by the user.
49	49	*/
50		~~//class SimRelativePosition : public Input, public~~ Position
51		class SimRelativePosition : public InputMixer<Input,Position>
	50	class SimRelativePosition
	51	: public input_position_t
52	52	{
53	53	public:

r19793	r20602
30	30	#include <gadget/gadgetConfig.h>
31	31	#include <vector>
	32	#include <gadget/Type/InputBaseTypes.h>
32	33	#include <gadget/Type/Input.h>
33	34	#include <gadget/Type/Position.h>
34		~~#include <gadget/Type/InputMixer.h>~~
35	35	#include <gadget/Type/PositionInterface.h>
36	36	#include <jccl/Config/ConfigElementPtr.h>
…	…
52	52	//class SimSetablePosition : public Input, public Position
53	53	class GADGET_CLASS_API SimSetablePosition
54		: public ~~InputMixer<Input, Position>~~
	54	: public input_position_t
55	55	{
56	56	public:

r20309	r20602
98	98	REGISTER_CONSTRUCTOR_TYPE(input_analog_position_t);
99	99	REGISTER_CONSTRUCTOR_TYPE(input_glove_digital_t);
	100	REGISTER_CONSTRUCTOR_TYPE(input_digital_analog_position_t);
100	101	REGISTER_CONSTRUCTOR_TYPE(siminput_input_position);
101	102	REGISTER_CONSTRUCTOR_TYPE(siminput_input_digital);
102	103	REGISTER_CONSTRUCTOR_TYPE(siminput_input_analog);
103		REGISTER_CONSTRUCTOR_TYPE(~~input_digital_analog_position~~_t);
	104	REGISTER_CONSTRUCTOR_TYPE(siminput_input_digital_glove_t);
104	105	}
105	106

r20310	r20602
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<Input, Digital>, Analog>, Position> input_digital_analog_position_t;
73	74	typedef InputMixer< InputMixer<SimInput, Input>, Position> siminput_input_position;
74	75	typedef InputMixer< InputMixer<SimInput, Input>, Digital> siminput_input_digital;
75	76	typedef InputMixer< InputMixer<SimInput, Input>, Analog> siminput_input_analog;
76		typedef InputMixer< InputMixer< InputMixer<~~Input, Digital>, Analog>, Position> input_digital_analog_position~~_t;
	77	typedef InputMixer< InputMixer< InputMixer<SimInput,Input>, Digital>, Glove> siminput_input_digital_glove_t;
77	78	//@}
78	79