History

got input recording working

Dante Ruiz committed 9 years ago

Commit 5cd40071 parent cd095916 files · +105 −37Browse files

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

Unified · Split

interface/src/Application.cpp+7−0
@@ -77,6 +77,7 @@ · 76 unmodified lines
77#include <InfoView.h>77#include <InfoView.h>
78#include <input-plugins/InputPlugin.h>78#include <input-plugins/InputPlugin.h>
79#include <controllers/UserInputMapper.h>79#include <controllers/UserInputMapper.h>
80#include <controllers/InputRecorder.h>
80#include <controllers/ScriptingInterface.h>81#include <controllers/ScriptingInterface.h>
81#include <controllers/StateController.h>82#include <controllers/StateController.h>
82#include <UserActivityLoggerScriptingInterface.h>83#include <UserActivityLoggerScriptingInterface.h>
@@ -2731,6 +2732,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 2648 unmodified lines
2731 if (isMeta) {2732 if (isMeta) {
2732 auto offscreenUi = DependencyManager::get<OffscreenUi>();2733 auto offscreenUi = DependencyManager::get<OffscreenUi>();
2733 offscreenUi->load("Browser.qml");2734 offscreenUi->load("Browser.qml");
2735 } else if (isOption) {
2736 controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
2737 inputRecorder->togglePlayback();
2734 }2738 }
2735 break;2739 break;
2736 2740
@@ -2929,6 +2933,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 192 unmodified lines
2929 Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, !isFirstPersonChecked);2933 Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, !isFirstPersonChecked);
2930 Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, isFirstPersonChecked);2934 Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, isFirstPersonChecked);
2931 cameraMenuChanged();2935 cameraMenuChanged();
2936 } else if (isOption) {
2937 controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
2938 inputRecorder->toggleRecording();
2932 }2939 }
2933 break;2940 break;
2934 }2941 }