History

(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements 1. Fixed thread-crash at terminate() time by terminating the LeapManager properly 2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener 3. Added fingerRoot positions to display and data packet 4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers 5. My avatar's fingers are different color from others

Eric Johnston committed 13 years ago

Commit 5d59bcb1 parent e85f4988 files · +208 −92Browse files

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

Unified · Split

interface/src/Application.cpp+6−1
@@ -953,6 +953,8 @@ void Application::terminate() { · 952 unmodified lines
953 // Close serial port953 // Close serial port
954 // close(serial_fd);954 // close(serial_fd);
955 955
956 LeapManager::terminate();
957
956 if (_settingsAutosave->isChecked()) {958 if (_settingsAutosave->isChecked()) {
957 saveSettings();959 saveSettings();
958 _settings->sync();960 _settings->sync();
@@ -1645,6 +1647,8 @@ void Application::init() { · 686 unmodified lines
1645 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);1647 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);
1646 }1648 }
1647 1649
1650 LeapManager::initialize();
1651
1648 gettimeofday(&_timerStart, NULL);1652 gettimeofday(&_timerStart, NULL);
1649 gettimeofday(&_lastTimeIdle, NULL);1653 gettimeofday(&_lastTimeIdle, NULL);
1650 1654
@@ -1803,7 +1807,8 @@ void Application::update(float deltaTime) { · 152 unmodified lines
1803 1807
1804 // Leap finger-sensing device1808 // Leap finger-sensing device
1805 LeapManager::nextFrame();1809 LeapManager::nextFrame();
1806 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerPositions());1810 _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());
1811 _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());
1807 1812
1808 // Read serial port interface devices1813 // Read serial port interface devices
1809 if (_serialHeadSensor.isActive()) {1814 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