History

Merge branch 'master' of https://github.com/worklist/hifi into pointy

Andrzej Kapolka committed 13 years ago

Commit d5abb3e2 parents fdeb63c 90794ca6 files · +77 −15Browse files

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

Unified · Split

interface/src/Application.cpp+3−0
@@ -1678,6 +1678,8 @@ void Application::initMenu() { · 1677 unmodified lines
1678 (_renderCoverageMapV2 = debugMenu->addAction("Render Coverage Map V2"))->setCheckable(true);1678 (_renderCoverageMapV2 = debugMenu->addAction("Render Coverage Map V2"))->setCheckable(true);
1679 _renderCoverageMapV2->setShortcut(Qt::SHIFT | Qt::CTRL | Qt::Key_P);1679 _renderCoverageMapV2->setShortcut(Qt::SHIFT | Qt::CTRL | Qt::Key_P);
1680 1680
1681 (_simulateLeapHand = debugMenu->addAction("Simulate Leap Hand"))->setCheckable(true);
1682 (_testRaveGlove = debugMenu->addAction("Test RaveGlove"))->setCheckable(true);
1681 1683
1682 QMenu* settingsMenu = menuBar->addMenu("Settings");1684 QMenu* settingsMenu = menuBar->addMenu("Settings");
1683 (_settingsAutosave = settingsMenu->addAction("Autosave"))->setCheckable(true);1685 (_settingsAutosave = settingsMenu->addAction("Autosave"))->setCheckable(true);
@@ -1936,6 +1938,7 @@ void Application::update(float deltaTime) { · 252 unmodified lines
1936 }1938 }
1937 1939
1938 // Leap finger-sensing device1940 // Leap finger-sensing device
1941 LeapManager::enableFakeFingers(_simulateLeapHand->isChecked() || _testRaveGlove->isChecked());
1939 LeapManager::nextFrame();1942 LeapManager::nextFrame();
1940 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());1943 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());
1941 _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());1944 _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t