Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all
Unified · Split
| @@ -1447,7 +1447,7 @@ void Application::importVoxels() { · 1446 unmodified lines | |||
| 1447 | importVoxels.readFromSquareARGB32Pixels(pixels, pngImage.height()); | 1447 | importVoxels.readFromSquareARGB32Pixels(pixels, pngImage.height()); |
| 1448 | } else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) { | 1448 | } else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) { |
| 1449 | importVoxels.readFromSVOFile(fileName); | 1449 | importVoxels.readFromSVOFile(fileName); |
| 1450 | } else { | 1450 | } else if (fileNameString.endsWith(".schematic", Qt::CaseInsensitive)) { |
| 1451 | importVoxels.readFromSchematicFile(fileName); | 1451 | importVoxels.readFromSchematicFile(fileName); |
| 1452 | } | 1452 | } |
| 1453 | 1453 | ||
| @@ -1480,9 +1480,6 @@ void Application::importVoxels() { · 26 unmodified lines | |||
| 1480 | // If we have voxels left in the packet, then send the packet | 1480 | // If we have voxels left in the packet, then send the packet |
| 1481 | if (args.bufferInUse > (numBytesPacketHeader + sizeof(unsigned short int))) { | 1481 | if (args.bufferInUse > (numBytesPacketHeader + sizeof(unsigned short int))) { |
| 1482 | controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1); | 1482 | controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1); |
| 1483 | printLog("sending packet: %d\n", ++args.packetsSent); | ||
| 1484 | args.bytesSent += args.bufferInUse; | ||
| 1485 | printLog("total bytes sent: %ld\n", args.bytesSent); | ||
| 1486 | } | 1483 | } |
| 1487 | 1484 | ||
| 1488 | if (calculatedOctCode) { | 1485 | if (calculatedOctCode) { |
| @@ -1704,6 +1701,8 @@ void Application::initMenu() { · 215 unmodified lines | |||
| 1704 | (_renderCoverageMapV2 = debugMenu->addAction("Render Coverage Map V2"))->setCheckable(true); | 1701 | (_renderCoverageMapV2 = debugMenu->addAction("Render Coverage Map V2"))->setCheckable(true); |
| 1705 | _renderCoverageMapV2->setShortcut(Qt::SHIFT | Qt::CTRL | Qt::Key_P); | 1702 | _renderCoverageMapV2->setShortcut(Qt::SHIFT | Qt::CTRL | Qt::Key_P); |
| 1706 | 1703 | ||
| 1704 | (_simulateLeapHand = debugMenu->addAction("Simulate Leap Hand"))->setCheckable(true); | ||
| 1705 | (_testRaveGlove = debugMenu->addAction("Test RaveGlove"))->setCheckable(true); | ||
| 1707 | 1706 | ||
| 1708 | QMenu* settingsMenu = menuBar->addMenu("Settings"); | 1707 | QMenu* settingsMenu = menuBar->addMenu("Settings"); |
| 1709 | (_settingsAutosave = settingsMenu->addAction("Autosave"))->setCheckable(true); | 1708 | (_settingsAutosave = settingsMenu->addAction("Autosave"))->setCheckable(true); |
| @@ -1962,6 +1961,7 @@ void Application::update(float deltaTime) { · 252 unmodified lines | |||
| 1962 | } | 1961 | } |
| 1963 | 1962 | ||
| 1964 | // Leap finger-sensing device | 1963 | // Leap finger-sensing device |
| 1964 | LeapManager::enableFakeFingers(_simulateLeapHand->isChecked() || _testRaveGlove->isChecked()); | ||
| 1965 | LeapManager::nextFrame(); | 1965 | LeapManager::nextFrame(); |
| 1966 | _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots()); | 1966 | _myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots()); |
| 1967 | _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals()); | 1967 | _myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals()); |