exposing palm velocity and angular velocity to js

Sam Gondelman committed 11 years ago

Commit 113c4ea1 parent d415ee14 files · +60 −5Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.h (1 of 4 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+12−5

@@ -86,16 +86,23 @@ public: · 85 unmodified lines
86		86
87	public slots:	87	public slots:
88	Q_INVOKABLE virtual QVector<UserInputMapper::Action> getAllActions();	88	Q_INVOKABLE virtual QVector<UserInputMapper::Action> getAllActions();
89	Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getInputChannelsForAction(UserInputMapper::Action action);	89
90	Q_INVOKABLE virtual QString getDeviceName(unsigned int device);
91	Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getAllInputsForDevice(unsigned int device);
92	Q_INVOKABLE virtual bool addInputChannel(UserInputMapper::InputChannel inputChannel);	90	Q_INVOKABLE virtual bool addInputChannel(UserInputMapper::InputChannel inputChannel);
93	Q_INVOKABLE virtual bool removeInputChannel(UserInputMapper::InputChannel inputChannel);	91	Q_INVOKABLE virtual bool removeInputChannel(UserInputMapper::InputChannel inputChannel);
		92	Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getInputChannelsForAction(UserInputMapper::Action action);
		93
94	Q_INVOKABLE virtual QVector<UserInputMapper::InputPair> getAvailableInputs(unsigned int device);	94	Q_INVOKABLE virtual QVector<UserInputMapper::InputPair> getAvailableInputs(unsigned int device);
95	Q_INVOKABLE virtual void resetAllDeviceBindings();	95	Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getAllInputsForDevice(unsigned int device);
		96
		97	Q_INVOKABLE virtual QString getDeviceName(unsigned int device);
		98
		99	Q_INVOKABLE virtual float getActionValue(int action);
		100
96	Q_INVOKABLE virtual void resetDevice(unsigned int device);	101	Q_INVOKABLE virtual void resetDevice(unsigned int device);
		102	Q_INVOKABLE virtual void resetAllDeviceBindings();
97	Q_INVOKABLE virtual int findDevice(QString name);	103	Q_INVOKABLE virtual int findDevice(QString name);
98	Q_INVOKABLE virtual float getActionValue(int action);	104
		105	Q_INVOKABLE virtual int findAction(QString actionName);
99		106
100	virtual bool isPrimaryButtonPressed() const;	107	virtual bool isPrimaryButtonPressed() const;
101	virtual glm::vec2 getPrimaryJoystickPosition() const;	108	virtual glm::vec2 getPrimaryJoystickPosition() const;