Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 00:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add and use Leap Motion controller releasing at script ending

Browse source
This commit is contained in:
David Rowe 2014-09-08 11:34:41 -07:00
parent 68cc49f19e
commit 999fac785a
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/leapOfFaith.js
View file

@ -255,4 +255,8 @@ Script.update.connect(function(deltaTime) {
}); });
Script.scriptEnding.connect(function() { Script.scriptEnding.connect(function() {
var i;
for (i = 0; i < jointControllers.length; i += 1) {
Controller.releaseInputController(jointControllers[i].c);
}
}); });

4
interface/src/scripting/ControllerScriptingInterface.cpp
View file

@ -297,6 +297,10 @@ AbstractInputController* ControllerScriptingInterface::createInputController(con
} }
} }
void ControllerScriptingInterface::releaseInputController(AbstractInputController* input) {
_inputControllers.erase(input->getKey());
}
void ControllerScriptingInterface::updateInputControllers() { void ControllerScriptingInterface::updateInputControllers() {
//TODO C++11 for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) { //TODO C++11 for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
for (InputControllerMap::iterator it = _inputControllers.begin(); it != _inputControllers.end(); it++) { for (InputControllerMap::iterator it = _inputControllers.begin(); it != _inputControllers.end(); it++) {

4
interface/src/scripting/ControllerScriptingInterface.h
View file

@ -76,8 +76,6 @@ public:
void updateInputControllers(); void updateInputControllers();
void releaseInputController(AbstractInputController* input);
public slots: public slots:
virtual bool isPrimaryButtonPressed() const; virtual bool isPrimaryButtonPressed() const;
virtual glm::vec2 getPrimaryJoystickPosition() const; virtual glm::vec2 getPrimaryJoystickPosition() const;
@ -116,6 +114,8 @@ public slots:
/// Factory to create an InputController /// Factory to create an InputController
virtual AbstractInputController* createInputController(const QString& deviceName, const QString& tracker); virtual AbstractInputController* createInputController(const QString& deviceName, const QString& tracker);
virtual void releaseInputController(AbstractInputController* input);
private: private:
const PalmData* getPrimaryPalm() const; const PalmData* getPrimaryPalm() const;
const PalmData* getPalm(int palmIndex) const; const PalmData* getPalm(int palmIndex) const;