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
953953 // Close serial port
954954 // close(serial_fd);
955955
956+ LeapManager::terminate();
957+
956958 if (_settingsAutosave->isChecked()) {
957959 saveSettings();
958960 _settings->sync();
@@ -1645,6 +1647,8 @@ void Application::init() { · 686 unmodified lines
16451647 QMetaObject::invokeMethod(_fullScreenMode, "trigger", Qt::QueuedConnection);
16461648 }
16471649
1650+ LeapManager::initialize();
1651+
16481652 gettimeofday(&_timerStart, NULL);
16491653 gettimeofday(&_lastTimeIdle, NULL);
16501654
@@ -1803,7 +1807,8 @@ void Application::update(float deltaTime) { · 152 unmodified lines
18031807
18041808 // Leap finger-sensing device
18051809 LeapManager::nextFrame();
1806− _myAvatar.getHand().setLeapFingers(LeapManager::getFingerPositions());
1810+ _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots());
1811+ _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals());
18071812
18081813 // Read serial port interface devices
18091814 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