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
432432 void Application::resizeGL(int width, int height) {
433433 float aspectRatio = ((float)width/(float)height); // based on screen resize
434434
435+ // reset the camera FOV to our preference...
436+ _myCamera.setFieldOfView(_horizontalFieldOfView);
437+
435438 // get the lens details from the current camera
436439 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;
437440 float nearClip = camera.getNearClip();
@@ -953,6 +956,8 @@ void Application::terminate() { · 515 unmodified lines
953956 // Close serial port
954957 // close(serial_fd);
955958
959+ LeapManager::terminate();
960+
956961 if (_settingsAutosave->isChecked()) {
957962 saveSettings();
958963 _settings->sync();
@@ -1645,6 +1650,8 @@ void Application::init() { · 686 unmodified lines
16451650 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);
16461651 }
16471652
1653+ LeapManager::initialize();
1654+
16481655 gettimeofday(&_timerStart, NULL);
16491656 gettimeofday(&_lastTimeIdle, NULL);
16501657
@@ -1803,7 +1810,8 @@ void Application::update(float deltaTime) { · 152 unmodified lines
18031810
18041811 // Leap finger-sensing device
18051812 LeapManager::nextFrame();
1806− _myAvatar.getHand().setLeapFingers(LeapManager::getFingerPositions());
1813+ _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());
1814+ _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());
18071815
18081816 // Read serial port interface devices
18091817 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