History

experimenting with input plugins

Brad Davis committed 11 years ago

Commit e4211411 parent cdb662017 files · +173 −68Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+14−13
@@ -17,7 +17,7 @@ · 16 unmodified lines
17 17
18#include "Application.h"18#include "Application.h"
19#include "devices/MotionTracker.h"19#include "devices/MotionTracker.h"
20#include "devices/SixenseManager.h"20//#include "devices/SixenseManager.h"
21#include "ControllerScriptingInterface.h"21#include "ControllerScriptingInterface.h"
22 22
23 23
@@ -81,13 +81,14 @@ void inputChannelFromScriptValue(const QScriptValue& object, UserInputMapper::In · 57 unmodified lines
81 81
82QScriptValue actionToScriptValue(QScriptEngine* engine, const UserInputMapper::Action& action) {82QScriptValue actionToScriptValue(QScriptEngine* engine, const UserInputMapper::Action& action) {
83 QScriptValue obj = engine->newObject();83 QScriptValue obj = engine->newObject();
84 QVector<UserInputMapper::InputChannel> inputChannels = Application::getUserInputMapper()->getInputChannelsForAction(action);84 auto userInputMapper = DependencyManager::get<UserInputMapper>();
85 QVector<UserInputMapper::InputChannel> inputChannels = userInputMapper->getInputChannelsForAction(action);
85 QScriptValue _inputChannels = engine->newArray(inputChannels.size());86 QScriptValue _inputChannels = engine->newArray(inputChannels.size());
86 for (int i = 0; i < inputChannels.size(); i++) {87 for (int i = 0; i < inputChannels.size(); i++) {
87 _inputChannels.setProperty(i, inputChannelToScriptValue(engine, inputChannels[i]));88 _inputChannels.setProperty(i, inputChannelToScriptValue(engine, inputChannels[i]));
88 }89 }
89 obj.setProperty("action", (int) action);90 obj.setProperty("action", (int) action);
90 obj.setProperty("actionName", Application::getUserInputMapper()->getActionName(action));91 obj.setProperty("actionName", userInputMapper->getActionName(action));
91 obj.setProperty("inputChannels", _inputChannels);92 obj.setProperty("inputChannels", _inputChannels);
92 return obj;93 return obj;
93}94}
@@ -427,43 +428,43 @@ void ControllerScriptingInterface::updateInputControllers() { · 333 unmodified lines
427}428}
428 429
429QVector<UserInputMapper::Action> ControllerScriptingInterface::getAllActions() {430QVector<UserInputMapper::Action> ControllerScriptingInterface::getAllActions() {
430 return Application::getUserInputMapper()->getAllActions();431 return DependencyManager::get<UserInputMapper>()->getAllActions();
431}432}
432 433
433QVector<UserInputMapper::InputChannel> ControllerScriptingInterface::getInputChannelsForAction(UserInputMapper::Action action) {434QVector<UserInputMapper::InputChannel> ControllerScriptingInterface::getInputChannelsForAction(UserInputMapper::Action action) {
434 return Application::getUserInputMapper()->getInputChannelsForAction(action);435 return DependencyManager::get<UserInputMapper>()->getInputChannelsForAction(action);
435}436}
436 437
437QString ControllerScriptingInterface::getDeviceName(unsigned int device) {438QString ControllerScriptingInterface::getDeviceName(unsigned int device) {
438 return Application::getUserInputMapper()->getDeviceName((unsigned short) device);439 return DependencyManager::get<UserInputMapper>()->getDeviceName((unsigned short)device);
439}440}
440 441
441QVector<UserInputMapper::InputChannel> ControllerScriptingInterface::getAllInputsForDevice(unsigned int device) {442QVector<UserInputMapper::InputChannel> ControllerScriptingInterface::getAllInputsForDevice(unsigned int device) {
442 return Application::getUserInputMapper()->getAllInputsForDevice(device);443 return DependencyManager::get<UserInputMapper>()->getAllInputsForDevice(device);
443}444}
444 445
445bool ControllerScriptingInterface::addInputChannel(UserInputMapper::InputChannel inputChannel) {446bool ControllerScriptingInterface::addInputChannel(UserInputMapper::InputChannel inputChannel) {
446 return Application::getUserInputMapper()->addInputChannel(inputChannel._action, inputChannel._input, inputChannel._modifier, inputChannel._scale);447 return DependencyManager::get<UserInputMapper>()->addInputChannel(inputChannel._action, inputChannel._input, inputChannel._modifier, inputChannel._scale);
447}448}
448 449
449bool ControllerScriptingInterface::removeInputChannel(UserInputMapper::InputChannel inputChannel) {450bool ControllerScriptingInterface::removeInputChannel(UserInputMapper::InputChannel inputChannel) {
450 return Application::getUserInputMapper()->removeInputChannel(inputChannel);451 return DependencyManager::get<UserInputMapper>()->removeInputChannel(inputChannel);
451}452}
452 453
453QVector<UserInputMapper::InputPair> ControllerScriptingInterface::getAvailableInputs(unsigned int device) {454QVector<UserInputMapper::InputPair> ControllerScriptingInterface::getAvailableInputs(unsigned int device) {
454 return Application::getUserInputMapper()->getAvailableInputs((unsigned short) device);455 return DependencyManager::get<UserInputMapper>()->getAvailableInputs((unsigned short)device);
455}456}
456 457
457void ControllerScriptingInterface::resetAllDeviceBindings() {458void ControllerScriptingInterface::resetAllDeviceBindings() {
458 Application::getUserInputMapper()->resetAllDeviceBindings();459 DependencyManager::get<UserInputMapper>()->resetAllDeviceBindings();
459}460}
460 461
461void ControllerScriptingInterface::resetDevice(unsigned int device) {462void ControllerScriptingInterface::resetDevice(unsigned int device) {
462 Application::getUserInputMapper()->resetDevice(device);463 DependencyManager::get<UserInputMapper>()->resetDevice(device);
463}464}
464 465
465int ControllerScriptingInterface::findDevice(QString name) {466int ControllerScriptingInterface::findDevice(QString name) {
466 return Application::getUserInputMapper()->findDevice(name);467 return DependencyManager::get<UserInputMapper>()->findDevice(name);
467}468}
468 469
469InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :470InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :