History

move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick

Stephen Birarda committed 12 years ago

Commit 00b08061 parent 900daf413 files · +216 −218Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+0−11
@@ -297,17 +297,6 @@ AbstractInputController* ControllerScriptingInterface::createInputController(con · 296 unmodified lines
297 }297 }
298}298}
299 299
300JoystickInputController* ControllerScriptingInterface::joystick() const {
301 // stub to just return the first joystick - assume we only have one connected
302 QVector<JoystickInputController>& activeJoysticks = Application::getInstance()->getJoystickManager()->getJoysticks();
303
304 if (activeJoysticks.size() > 0) {
305 return &activeJoysticks[0];
306 } else {
307 return NULL;
308 }
309}
310
311void ControllerScriptingInterface::releaseInputController(AbstractInputController* input) {300void ControllerScriptingInterface::releaseInputController(AbstractInputController* input) {
312 _inputControllers.erase(input->getKey());301 _inputControllers.erase(input->getKey());
313}302}