History

Merge remote-tracking branch 'upstream/master' into particles

Jeffrey Ventrella committed 13 years ago

Commit f75ce722 parents 83c779a 1886df86 files · +73 −15Browse files

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

Unified · Split

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