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
7777 #include <InfoView.h>
7878 #include <input-plugins/InputPlugin.h>
7979 #include <controllers/UserInputMapper.h>
80+#include <controllers/InputRecorder.h>
8081 #include <controllers/ScriptingInterface.h>
8182 #include <controllers/StateController.h>
8283 #include <UserActivityLoggerScriptingInterface.h>
@@ -2731,6 +2732,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 2648 unmodified lines
27312732 if (isMeta) {
27322733 auto offscreenUi = DependencyManager::get<OffscreenUi>();
27332734 offscreenUi->load("Browser.qml");
2735+ } else if (isOption) {
2736+ controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
2737+ inputRecorder->togglePlayback();
27342738 }
27352739 break;
27362740
@@ -2929,6 +2933,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 192 unmodified lines
29292933 Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, !isFirstPersonChecked);
29302934 Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, isFirstPersonChecked);
29312935 cameraMenuChanged();
2936+ } else if (isOption) {
2937+ controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
2938+ inputRecorder->toggleRecording();
29322939 }
29332940 break;
29342941 }