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
59#include "Menu.h"59#include "Menu.h"
60#include "Swatch.h"60#include "Swatch.h"
61#include "Util.h"61#include "Util.h"
62#include "devices/LeapManager.h"
63#include "devices/OculusManager.h"62#include "devices/OculusManager.h"
64#include "devices/TV3DManager.h"63#include "devices/TV3DManager.h"
65#include "renderer/ProgramObject.h"64#include "renderer/ProgramObject.h"
@@ -1437,7 +1436,6 @@ void Application::terminate() { · 1371 unmodified lines
1437 // Close serial port1436 // Close serial port
1438 // close(serial_fd);1437 // close(serial_fd);
1439 1438
1440 LeapManager::terminate();
1441 Menu::getInstance()->saveSettings();1439 Menu::getInstance()->saveSettings();
1442 _rearMirrorTools->saveSettings(_settings);1440 _rearMirrorTools->saveSettings(_settings);
1443 _settings->sync();1441 _settings->sync();
@@ -1902,8 +1900,6 @@ void Application::init() { · 458 unmodified lines
1902 Qt::QueuedConnection);1900 Qt::QueuedConnection);
1903 }1901 }
1904 1902
1905 LeapManager::initialize();
1906
1907 gettimeofday(&_timerStart, NULL);1903 gettimeofday(&_timerStart, NULL);
1908 gettimeofday(&_lastTimeUpdated, NULL);1904 gettimeofday(&_lastTimeUpdated, NULL);
1909 1905
@@ -2383,9 +2379,6 @@ void Application::updateHandAndTouch(float deltaTime) { · 473 unmodified lines
2383void Application::updateLeap(float deltaTime) {2379void Application::updateLeap(float deltaTime) {
2384 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);2380 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2385 PerformanceWarning warn(showWarnings, "Application::updateLeap()");2381 PerformanceWarning warn(showWarnings, "Application::updateLeap()");
2386
2387 LeapManager::enableFakeFingers(Menu::getInstance()->isOptionChecked(MenuOption::SimulateLeapHand));
2388 LeapManager::nextFrame();
2389}2382}
2390 2383
2391void Application::updateSixense(float deltaTime) {2384void Application::updateSixense(float deltaTime) {
@@ -3676,11 +3669,6 @@ void Application::displayStats() { · 1284 unmodified lines
3676 statsVerticalOffset += PELS_PER_LINE;3669 statsVerticalOffset += PELS_PER_LINE;
3677 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3670 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());
3678 3671
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
3684 if (_perfStatsOn) {3672 if (_perfStatsOn) {
3685 // Get the PerfStats group details. We need to allocate and array of char* long enough to hold 1+groups3673 // Get the PerfStats group details. We need to allocate and array of char* long enough to hold 1+groups
3686 char** perfStatLinesArray = new char*[PerfStat::getGroupCount()+1];3674 char** perfStatLinesArray = new char*[PerfStat::getGroupCount()+1];
@@ -4152,7 +4140,6 @@ void Application::resetSensors() { · 465 unmodified lines
4152 }4140 }
4153 _webcam.reset();4141 _webcam.reset();
4154 _faceshift.reset();4142 _faceshift.reset();
4155 LeapManager::reset();
4156 4143
4157 if (OculusManager::isConnected()) {4144 if (OculusManager::isConnected()) {
4158 OculusManager::reset();4145 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