almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly

Anthony J. Thibault committed 11 years ago

Commit 060f6c11 parent 108353420 files · +367 −204Browse files

Showing the changes to interface/src/Application.cpp (1 of 20 files). Show all

Unified · Split

 #include <DeferredLightingEffect.h>
 #include <DependencyManager.h>
 #include <display-plugins/DisplayPlugin.h>
 #include <EntityScriptingInterface.h>
 #include <ErrorDialog.h>
 #include <GlowEffect.h>
 #include <HFActionEvent.h>
 #include <HFBackEvent.h>
 #include <InfoView.h>
+#include <input-plugins/InputPlugin.h>
+#include <input-plugins/Joystick.h> // this should probably be removed
+#include <input-plugins/SixenseManager.h> // this definitely should be removed
 #include <LogHandler.h>
 #include <MainWindow.h>
 #include <MessageDialog.h>
 #include "devices/Leapmotion.h"
 #include "devices/RealSense.h"
 #include "devices/MIDIManager.h"
-#include <input-plugins/SDL2Manager.h>
-#include <input-plugins/SixenseManager.h>
-#include <input-plugins/ViveControllerManager.h>
 #include "RenderDeferredTask.h"
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
     connect(userInputMapper.data(), &UserInputMapper::actionEvent, &_controllerScriptingInterface, &AbstractControllerScriptingInterface::actionEvent);
+    auto inputPlugins = getInputPlugins();
+    foreach(auto inputPlugin, inputPlugins) {
+        QString name = inputPlugin->getName();
+        if (name == KeyboardMouseDevice::NAME) {
+            _keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
+        }
+    }
+    //updateInputModes(); // TODO: shouldn't have to call this explicitly
     // Setup the keyboardMouseDevice and the user input mapper with the default bindings
-    _keyboardMouseDevice.registerToUserInputMapper(*userInputMapper);
+    _keyboardMouseDevice->registerToUserInputMapper(*userInputMapper);
-    _keyboardMouseDevice.assignDefaultInputMapping(*userInputMapper);
+    _keyboardMouseDevice->assignDefaultInputMapping(*userInputMapper);
     // check first run...
     if (_firstRun.get()) {
     connect(ddeTracker.data(), &FaceTracker::muteToggled, this, &Application::faceTrackerMuteToggled);
 #endif
-    if (ViveControllerManager::getInstance().isSupported()) {
-        ViveControllerManager::getInstance().init();
-        ViveControllerManager::getInstance().activate(NULL);
-    }
     _oldHandMouseX[0] = -1;
     _oldHandMouseY[0] = -1;
     _oldHandMouseX[1] = -1;
     getActiveDisplayPlugin()->deactivate();
+    auto inputPlugins = getInputPlugins();
+    foreach(auto inputPlugin, inputPlugins) {
+        QString name = inputPlugin->getName();
+        QAction* action = Menu::getInstance()->getActionForOption(name);
+        if (action->isChecked()) {
+            inputPlugin->deactivate();
+        }
+    }
     // remove avatars from physics engine
     DependencyManager::get<AvatarManager>()->clearOtherAvatars();
     _physicsEngine.deleteObjects(DependencyManager::get<AvatarManager>()->getObjectsToDelete());
     }
     if (hasFocus()) {
-        _keyboardMouseDevice.keyPressEvent(event);
+        if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+            _keyboardMouseDevice->keyPressEvent(event);
+        }
         bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
         bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);
         return;
     }
-    _keyboardMouseDevice.keyReleaseEvent(event);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->keyReleaseEvent(event);
+    }
     switch (event->key()) {
         case Qt::Key_Space: {
 }
 void Application::focusOutEvent(QFocusEvent* event) {
-    _keyboardMouseDevice.pluginFocusOutEvent();
+    auto inputPlugins = getInputPlugins();
-    SixenseManager::getInstance().pluginFocusOutEvent();
+    foreach(auto inputPlugin, inputPlugins) {
-    SDL2Manager::getInstance()->pluginFocusOutEvent();
+        QString name = inputPlugin->getName();
-    ViveControllerManager::getInstance().pluginFocusOutEvent();
+        QAction* action = Menu::getInstance()->getActionForOption(name);
+        if (action->isChecked()) {
+            inputPlugin->pluginFocusOutEvent();
+        }
+    }
     // synthesize events for keys currently pressed, since we may not get their release events
     foreach (int key, _keysPressed) {
         return;
     }
-    _keyboardMouseDevice.mouseMoveEvent(event, deviceID);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->mouseMoveEvent(event, deviceID);
+    }
 }
     if (hasFocus()) {
-        _keyboardMouseDevice.mousePressEvent(event);
+        if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+            _keyboardMouseDevice->mousePressEvent(event);
+        }
         if (event->button() == Qt::LeftButton) {
             _mouseDragStarted = getTrueMouse();
     }
     if (hasFocus()) {
-        _keyboardMouseDevice.mouseReleaseEvent(event);
+        if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+            _keyboardMouseDevice->mouseReleaseEvent(event);
+        }
         if (event->button() == Qt::LeftButton) {
             _mousePressed = false;
         return;
     }
-    _keyboardMouseDevice.touchUpdateEvent(event);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->touchUpdateEvent(event);
+    }
     bool validTouch = false;
     if (hasFocus()) {
         return;
     }
-    _keyboardMouseDevice.touchBeginEvent(event);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->touchBeginEvent(event);
+    }
 }
         return;
     }
-    _keyboardMouseDevice.touchEndEvent(event);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->touchEndEvent(event);
+    }
     // put any application specific touch behavior below here..
     _touchDragStartedAvg = _touchAvg;
     if (_controllerScriptingInterface.isWheelCaptured()) {
         return;
     }
-    _keyboardMouseDevice.wheelEvent(event);
+    if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
+        _keyboardMouseDevice->wheelEvent(event);
+    }
 }
 void Application::dropEvent(QDropEvent *event) {
             PerformanceTimer perfTimer("updateGL");
             PerformanceWarning warn(showWarnings, "Application::idle()... updateGL()");
             getActiveDisplayPlugin()->idle();
+            auto inputPlugins = getInputPlugins();
+            foreach(auto inputPlugin, inputPlugins) {
+                QString name = inputPlugin->getName();
+                QAction* action = Menu::getInstance()->getActionForOption(name);
+                if (action->isChecked()) {
+                    inputPlugin->idle();
+                }
+            }
         }
         {
             PerformanceTimer perfTimer("rest");
     userInputMapper->setSensorToWorldMat(_myAvatar->getSensorToWorldMatrix());
     userInputMapper->update(deltaTime);
-    _keyboardMouseDevice.pluginUpdate(deltaTime);
+    auto inputPlugins = getInputPlugins();
-    SixenseManager::getInstance().pluginUpdate(deltaTime);
+    foreach(auto inputPlugin, inputPlugins) {
-    SDL2Manager::getInstance()->pluginUpdate(deltaTime);
+        QString name = inputPlugin->getName();
-    ViveControllerManager::getInstance().pluginUpdate(deltaTime);
+        QAction* action = Menu::getInstance()->getActionForOption(name);
+        if (action->isChecked()) {
+            inputPlugin->pluginUpdate(deltaTime); // add flag to prevent multiple devices from modifying joints
+        }
+    }
     // Dispatch input events
     _controllerScriptingInterface.updateInputControllers();
     palm->setActive(pose.isValid());
-    // TODO: velocity filters, tip velocities, et.c
+    // TODO: velocity filters, tip velocities, etc.
     // see SixenseManager
     // transform from sensor space, to world space, to avatar model space.
         float yAngle = 0.5f - ((atan2f(direction.z, direction.y) + (float)M_PI_2));
         auto canvasSize = qApp->getCanvasSize();
         // Get the pixel range over which the xAngle and yAngle are scaled
-        // TODO: move this from SixenseManager
+        float cursorRange = canvasSize.x * InputDevice::getCursorPixelRangeMult();
-        float cursorRange = canvasSize.x * SixenseManager::getInstance().getCursorPixelRangeMult();
         pos.setX(canvasSize.x / 2.0f + cursorRange * xAngle);
         pos.setY(canvasSize.y / 2.0f + cursorRange * yAngle);
     Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
 }
+static QVector<QPair<QString, QString>> _currentInputPluginActions;
+void Application::updateInputModes() {
+    auto menu = Menu::getInstance();
+    auto inputPlugins = getInputPlugins();
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    InputPluginPointer newInputPlugin = InputPluginPointer(nullptr);
+    InputPluginPointer removedInputPlugin = InputPluginPointer(nullptr);
+    foreach(InputPluginPointer inputPlugin, inputPlugins) {
+        QString name = inputPlugin->getName();
+        QAction* action = menu->getActionForOption(name);
+        if (action->isChecked() && !_activeInputPlugins.contains(inputPlugin)) {
+            _activeInputPlugins.append(inputPlugin);
+            newInputPlugin = inputPlugin;
+            break;
+        } else if (!action->isChecked() && _activeInputPlugins.contains(inputPlugin)) {
+            _activeInputPlugins.removeOne(inputPlugin);
+            removedInputPlugin = inputPlugin;
+            break;
+        }
+    }
+    // A plugin was checked
+    if (newInputPlugin) {
+        newInputPlugin->activate(this);
+        newInputPlugin->installEventFilter(qApp);
+        newInputPlugin->installEventFilter(offscreenUi.data());
+    } else if (removedInputPlugin) { // A plugin was unchecked
+        removedInputPlugin->deactivate();
+        removedInputPlugin->removeEventFilter(qApp);
+        removedInputPlugin->removeEventFilter(offscreenUi.data());
+    }
+    if (newInputPlugin || removedInputPlugin) {
+        if (!_currentInputPluginActions.isEmpty()) {
+            auto menu = Menu::getInstance();
+            foreach(auto itemInfo, _currentInputPluginActions) {
+                menu->removeMenuItem(itemInfo.first, itemInfo.second);
+            }
+            _currentInputPluginActions.clear();
+        }
+    }
+}
 void Application::addMenuItem(const QString& path, const QString& name, std::function<void()> onClicked, bool checkable, bool checked, const QString& groupName) {
     auto menu = Menu::getInstance();
     MenuWrapper* parentItem = menu->getMenu(path);
         onClicked();
     });
     _currentDisplayPluginActions.push_back({ path, name });
+    _currentInputPluginActions.push_back({ path, name });
 }
 GlWindow* Application::getVisibleWindow() {