History

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

Leonardo Murillo committed 12 years ago

Commit da2f8142 parents ede32cf f0460ba12 files · +20 −495Browse files

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

Unified · Split

interface/src/Application.cpp+0−13
@@ -59,7 +59,6 @@ · 58 unmodified lines
5959 #include "Menu.h"
6060 #include "Swatch.h"
6161 #include "Util.h"
62−#include "devices/LeapManager.h"
6362 #include "devices/OculusManager.h"
6463 #include "devices/TV3DManager.h"
6564 #include "renderer/ProgramObject.h"
@@ -1437,7 +1436,6 @@ void Application::terminate() { · 1371 unmodified lines
14371436 // Close serial port
14381437 // close(serial_fd);
14391438
1440− LeapManager::terminate();
14411439 Menu::getInstance()->saveSettings();
14421440 _rearMirrorTools->saveSettings(_settings);
14431441 _settings->sync();
@@ -1902,8 +1900,6 @@ void Application::init() { · 458 unmodified lines
19021900 Qt::QueuedConnection);
19031901 }
19041902
1905− LeapManager::initialize();
1906−
19071903 gettimeofday(&_timerStart, NULL);
19081904 gettimeofday(&_lastTimeUpdated, NULL);
19091905
@@ -2383,9 +2379,6 @@ void Application::updateHandAndTouch(float deltaTime) { · 473 unmodified lines
23832379 void Application::updateLeap(float deltaTime) {
23842380 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
23852381 PerformanceWarning warn(showWarnings, "Application::updateLeap()");
2386−
2387− LeapManager::enableFakeFingers(Menu::getInstance()->isOptionChecked(MenuOption::SimulateLeapHand));
2388− LeapManager::nextFrame();
23892382 }
23902383
23912384 void Application::updateSixense(float deltaTime) {
@@ -3676,11 +3669,6 @@ void Application::displayStats() { · 1284 unmodified lines
36763669 statsVerticalOffset += PELS_PER_LINE;
36773670 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());
36783671
3679−
3680− // Leap data
3681− statsVerticalOffset += PELS_PER_LINE;
3682− drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)LeapManager::statusString().c_str());
3683−
36843672 if (_perfStatsOn) {
36853673 // Get the PerfStats group details. We need to allocate and array of char* long enough to hold 1+groups
36863674 char** perfStatLinesArray = new char*[PerfStat::getGroupCount()+1];
@@ -4152,7 +4140,6 @@ void Application::resetSensors() { · 465 unmodified lines
41524140 }
41534141 _webcam.reset();
41544142 _faceshift.reset();
4155− LeapManager::reset();
41564143
41574144 if (OculusManager::isConnected()) {
41584145 OculusManager::reset();

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