diff --git a/src/model/controllers/ui/uiController.cpp b/src/model/controllers/ui/uiController.cpp index 0c30169..655d8c0 100644 --- a/src/model/controllers/ui/uiController.cpp +++ b/src/model/controllers/ui/uiController.cpp @@ -7,7 +7,7 @@ UiController::UiController(psvr::Psvr *hmd) : _hmd(hmd) menuSize = cv::Size2i(400, 400); menuPos = cv::Point2i(DEFAULT_UI_SIZE_X - menuSize.width, (DEFAULT_UI_SIZE_Y / 2) - (menuSize.height / 2)); // centered right selectedIndex = 0; - menuItemNames = {"set vr mode", "set cinema mode", "settings"}; + menuItemNames = {"set vr mode", "set cinema mode", "settings","quit"}; unsigned int i = 0; update(); cout << "done init ui controller" << endl; @@ -27,18 +27,23 @@ void UiController::Update(const std::string &message_from_subject) selectedDown(); break; case '1': + cout << c << "1" << endl; click(); break; case '2': + cout << c << "2" << endl; click(); break; case '3': + cout << c << "3" << endl; click(); break; - case '4': + case '0': + cout << c << "0" << endl; click(); break; default: + cout << c << endl; break; } } @@ -78,7 +83,7 @@ void UiController::vrMode() void UiController::click() { - exitCalled = true; + //exitCalled = true; // std::invoke(menuItems[menuItemNames.at(selectedIndex)]); switch (selectedIndex) { @@ -91,6 +96,9 @@ void UiController::click() case 2: openSettings(); break; + case 3: + exit(0); + break; default: break; } diff --git a/src/pipeline/members/zbarAnalysisNode.cpp b/src/pipeline/members/zbarAnalysisNode.cpp index 8aaef92..1408492 100644 --- a/src/pipeline/members/zbarAnalysisNode.cpp +++ b/src/pipeline/members/zbarAnalysisNode.cpp @@ -7,7 +7,7 @@ ZbarAnalysisNode::ZbarAnalysisNode(PipelineNode* _previous, zbarScanner* scanner { isFirst = false; previous = _previous; - fpsLimit = 30; + fpsLimit = 60; } void ZbarAnalysisNode::processFrame() diff --git a/src/prog b/src/prog index 98cbee2..8c853fe 100755 Binary files a/src/prog and b/src/prog differ