History

Rudimentary Sixense (Razer Hydra) support.

Andrzej Kapolka committed 13 years ago

Commit 1f2fe5d1 parent ce4e9984 files · +17 −1Browse files

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

Unified · Split

interface/src/Application.cpp+8−0
@@ -2205,6 +2205,13 @@ void Application::updateLeap(float deltaTime) { · 2204 unmodified lines
2205 LeapManager::nextFrame(_myAvatar);2205 LeapManager::nextFrame(_myAvatar);
2206}2206}
2207 2207
2208void Application::updateSixense() {
2209 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2210 PerformanceWarning warn(showWarnings, "Application::updateSixense()");
2211
2212 _sixenseManager.update();
2213}
2214
2208void Application::updateSerialDevices(float deltaTime) {2215void Application::updateSerialDevices(float deltaTime) {
2209 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);2216 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2210 PerformanceWarning warn(showWarnings, "Application::updateSerialDevices()");2217 PerformanceWarning warn(showWarnings, "Application::updateSerialDevices()");
@@ -2412,6 +2419,7 @@ void Application::update(float deltaTime) { · 201 unmodified lines
2412 updateMouseVoxels(deltaTime, mouseRayOrigin, mouseRayDirection, distance, face); // UI/UX related to voxels2419 updateMouseVoxels(deltaTime, mouseRayOrigin, mouseRayDirection, distance, face); // UI/UX related to voxels
2413 updateHandAndTouch(deltaTime); // Update state for touch sensors2420 updateHandAndTouch(deltaTime); // Update state for touch sensors
2414 updateLeap(deltaTime); // Leap finger-sensing device2421 updateLeap(deltaTime); // Leap finger-sensing device
2422 updateSixense(); // Razer Hydra controllers
2415 updateSerialDevices(deltaTime); // Read serial port interface devices2423 updateSerialDevices(deltaTime); // Read serial port interface devices
2416 updateAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes2424 updateAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes
2417 updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...2425 updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...

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