History

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

Andrzej Kapolka committed 13 years ago

Commit e866c222 parents ebab09e 00fa68816 files · +230 −109Browse files

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

Unified · Split

interface/src/Application.cpp+9−1
@@ -432,6 +432,9 @@ void Application::paintGL() { · 431 unmodified lines
432void Application::resizeGL(int width, int height) {432void Application::resizeGL(int width, int height) {
433 float aspectRatio = ((float)width/(float)height); // based on screen resize433 float aspectRatio = ((float)width/(float)height); // based on screen resize
434 434
435 // reset the camera FOV to our preference...
436 _myCamera.setFieldOfView(_horizontalFieldOfView);
437
435 // get the lens details from the current camera438 // get the lens details from the current camera
436 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;439 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;
437 float nearClip = camera.getNearClip();440 float nearClip = camera.getNearClip();
@@ -953,6 +956,8 @@ void Application::terminate() { · 515 unmodified lines
953 // Close serial port956 // Close serial port
954 // close(serial_fd);957 // close(serial_fd);
955 958
959 LeapManager::terminate();
960
956 if (_settingsAutosave->isChecked()) {961 if (_settingsAutosave->isChecked()) {
957 saveSettings();962 saveSettings();
958 _settings->sync();963 _settings->sync();
@@ -1645,6 +1650,8 @@ void Application::init() { · 686 unmodified lines
1645 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);1650 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);
1646 }1651 }
1647 1652
1653 LeapManager::initialize();
1654
1648 gettimeofday(&_timerStart, NULL);1655 gettimeofday(&_timerStart, NULL);
1649 gettimeofday(&_lastTimeIdle, NULL);1656 gettimeofday(&_lastTimeIdle, NULL);
1650 1657
@@ -1803,7 +1810,8 @@ void Application::update(float deltaTime) { · 152 unmodified lines
1803 1810
1804 // Leap finger-sensing device1811 // Leap finger-sensing device
1805 LeapManager::nextFrame();1812 LeapManager::nextFrame();
1806 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerPositions());1813 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());
1814 _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());
1807 1815
1808 // Read serial port interface devices1816 // Read serial port interface devices
1809 if (_serialHeadSensor.isActive()) {1817 if (_serialHeadSensor.isActive()) {

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