Showing the changes to interface/src/Application.cpp (1 of 43 files). Show all
Unified · Split
| @@ -60,7 +60,7 @@ · 59 unmodified lines | |||
| 60 | #include <InfoView.h> | 60 | #include <InfoView.h> |
| 61 | #include <input-plugins/InputPlugin.h> | 61 | #include <input-plugins/InputPlugin.h> |
| 62 | #include <input-plugins/Joystick.h> // this should probably be removed | 62 | #include <input-plugins/Joystick.h> // this should probably be removed |
| 63 | #include <input-plugins/UserInputMapper.h> | 63 | #include <controllers/UserInputMapper.h> |
| 64 | #include <LogHandler.h> | 64 | #include <LogHandler.h> |
| 65 | #include <MainWindow.h> | 65 | #include <MainWindow.h> |
| 66 | #include <MessageDialog.h> | 66 | #include <MessageDialog.h> |
| @@ -614,7 +614,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 547 unmodified lines | |||
| 614 | 614 | ||
| 615 | // Setup the userInputMapper with the actions | 615 | // Setup the userInputMapper with the actions |
| 616 | auto userInputMapper = DependencyManager::get<UserInputMapper>(); | 616 | auto userInputMapper = DependencyManager::get<UserInputMapper>(); |
| 617 | connect(userInputMapper.data(), &UserInputMapper::actionEvent, &_controllerScriptingInterface, &AbstractControllerScriptingInterface::actionEvent); | 617 | connect(userInputMapper.data(), &UserInputMapper::actionEvent, &_controllerScriptingInterface, &ControllerScriptingInterface::actionEvent); |
| 618 | connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) { | 618 | connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) { |
| 619 | if (state) { | 619 | if (state) { |
| 620 | switch (action) { | 620 | switch (action) { |
| @@ -2708,7 +2708,7 @@ void Application::update(float deltaTime) { · 2087 unmodified lines | |||
| 2708 | } | 2708 | } |
| 2709 | 2709 | ||
| 2710 | // Dispatch input events | 2710 | // Dispatch input events |
| 2711 | _controllerScriptingInterface.updateInputControllers(); | 2711 | _controllerScriptingInterface.update(); |
| 2712 | 2712 | ||
| 2713 | // Transfer the user inputs to the driveKeys | 2713 | // Transfer the user inputs to the driveKeys |
| 2714 | myAvatar->clearDriveKeys(); | 2714 | myAvatar->clearDriveKeys(); |