Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-16 14:41:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3379 from ctrlaltdavid/20018

Browse source 
Code Review for Job #20018
This commit is contained in:
AndrewMeadows 2014-09-09 12:01:52 -07:00
commit c815ee53c9
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() {
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() {
//TODO C++11 for (auto 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 releaseInputController(AbstractInputController* input);
public slots:
virtual bool isPrimaryButtonPressed() const;
virtual glm::vec2 getPrimaryJoystickPosition() const;
@ -116,6 +114,8 @@ public slots:
/// Factory to create an InputController
virtual AbstractInputController* createInputController(const QString& deviceName, const QString& tracker);
virtual void releaseInputController(AbstractInputController* input);
private:
const PalmData* getPrimaryPalm() const;
const PalmData* getPalm(int palmIndex) const;