Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -130,8 +130,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 129 unmodified lines | |||
| 130 | _bytesPerSecond(0), | 130 | _bytesPerSecond(0), |
| 131 | _bytesCount(0), | 131 | _bytesCount(0), |
| 132 | _swatch(NULL), | 132 | _swatch(NULL), |
| 133 | _pasteMode(false), | 133 | _pasteMode(false) |
| 134 | _nudgeCount(0) | ||
| 135 | { | 134 | { |
| 136 | _applicationStartupTime = startup_time; | 135 | _applicationStartupTime = startup_time; |
| 137 | _window->setWindowTitle("Interface"); | 136 | _window->setWindowTitle("Interface"); |
| @@ -689,6 +688,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 551 unmodified lines | |||
| 689 | case Qt::Key_O: | 688 | case Qt::Key_O: |
| 690 | Menu::getInstance()->triggerOption(MenuOption::VoxelSelectMode); | 689 | Menu::getInstance()->triggerOption(MenuOption::VoxelSelectMode); |
| 691 | break; | 690 | break; |
| 691 | case Qt::Key_N: | ||
| 692 | Menu::getInstance()->triggerOption(MenuOption::VoxelNudgeMode); | ||
| 693 | break; | ||
| 692 | case Qt::Key_Slash: | 694 | case Qt::Key_Slash: |
| 693 | Menu::getInstance()->triggerOption(MenuOption::Stats); | 695 | Menu::getInstance()->triggerOption(MenuOption::Stats); |
| 694 | break; | 696 | break; |
| @@ -830,6 +832,9 @@ void Application::mousePressEvent(QMouseEvent* event) { · 135 unmodified lines | |||
| 830 | } | 832 | } |
| 831 | 833 | ||
| 832 | if (MAKE_SOUND_ON_VOXEL_CLICK && _isHoverVoxel && !_isHoverVoxelSounding) { | 834 | if (MAKE_SOUND_ON_VOXEL_CLICK && _isHoverVoxel && !_isHoverVoxelSounding) { |
| 835 | if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) { | ||
| 836 | _nudgeVoxel = _hoverVoxel; | ||
| 837 | } | ||
| 833 | _hoverVoxelOriginalColor[0] = _hoverVoxel.red; | 838 | _hoverVoxelOriginalColor[0] = _hoverVoxel.red; |
| 834 | _hoverVoxelOriginalColor[1] = _hoverVoxel.green; | 839 | _hoverVoxelOriginalColor[1] = _hoverVoxel.green; |
| 835 | _hoverVoxelOriginalColor[2] = _hoverVoxel.blue; | 840 | _hoverVoxelOriginalColor[2] = _hoverVoxel.blue; |
| @@ -1274,48 +1279,22 @@ void Application::pasteVoxels() { · 438 unmodified lines | |||
| 1274 | } | 1279 | } |
| 1275 | 1280 | ||
| 1276 | void Application::nudgeVoxels() { | 1281 | void Application::nudgeVoxels() { |
| 1277 | VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); | 1282 | if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) { |
| 1278 | 1283 | VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); | |
| 1279 | if (selectedNode) { | 1284 | |
| 1280 | qDebug("UnNudged xyz: %f, %f, %f\n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z); | 1285 | if (selectedNode) { |
| 1281 | // // clear the clipboard first... | 1286 | // glPushMatrix(); |
| 1282 | // _clipboard.killLocalVoxels(); | 1287 | // glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE); |
| 1283 | 1288 | // renderNudgeGrid(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); | |
| 1284 | // nudge the node | 1289 | // glPopMatrix(); |
| 1285 | glm::vec3 nudgeVec(0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s); | 1290 | qDebug("UnNudged xyz: %f, %f, %f\n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z); |
| 1286 | // glm::vec3 nudgeVec(_mouseVoxel.s, _mouseVoxel.s, _mouseVoxel.s); | 1291 | |
| 1287 | // _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, _mouseVoxel); | 1292 | // nudge the node |
| 1288 | _voxels.getVoxelTree()->nudgeSubTree(selectedNode, nudgeVec, _voxelEditSender); | 1293 | // glm::vec3 nudgeVec(_mouseVoxel.s, _mouseVoxel.s, _mouseVoxel.s); |
| 1289 | 1294 | // glm::vec3 nudgeVec(0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s); | |
| 1290 | // if (!selectedNode) { | 1295 | glm::vec3 nudgeVec(0.25 * _mouseVoxel.s, 0.25 * _mouseVoxel.s, 0.25 * _mouseVoxel.s); |
| 1291 | // qDebug("new node is null\n"); | 1296 | _voxels.getVoxelTree()->nudgeSubTree(selectedNode, nudgeVec, _voxelEditSender); |
| 1292 | // } else { | 1297 | } |
| 1293 | // // get octal code of this node | ||
| 1294 | // unsigned char* octalCode = selectedNode->getOctalCode(); | ||
| 1295 | |||
| 1296 | // // get voxel position/size | ||
| 1297 | // VoxelPositionSize nudgedDetails; | ||
| 1298 | // voxelDetailsForCode(octalCode, nudgedDetails); | ||
| 1299 | // qDebug("Nudged xyz: %f, %f, %f\n", nudgedDetails.x, nudgedDetails.y, nudgedDetails.z); | ||
| 1300 | // } | ||
| 1301 | |||
| 1302 | // // then copy onto it | ||
| 1303 | // _voxels.copySubTreeIntoNewTree(selectedNode, &_clipboard, true); | ||
| 1304 | // // deleteVoxelUnderCursor(); | ||
| 1305 | |||
| 1306 | // // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to | ||
| 1307 | // // the server as an set voxel message, this will also rebase the voxels to the new location | ||
| 1308 | // SendVoxelsOperationArgs args; | ||
| 1309 | |||
| 1310 | // // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the | ||
| 1311 | // // voxel size/position details. If we don't have an actual selectedNode then use the mouseVoxel to create a | ||
| 1312 | // // target octalCode for where the user is pointing. | ||
| 1313 | // args.newBaseOctCode = selectedNode->getOctalCode(); | ||
| 1314 | |||
| 1315 | // _clipboard.recurseTreeWithOperation(sendVoxelsOperation, &args); | ||
| 1316 | // _voxelEditSender.flushQueue(); | ||
| 1317 | } else { | ||
| 1318 | qDebug("selectedNode is NULL\n"); | ||
| 1319 | } | 1298 | } |
| 1320 | } | 1299 | } |
| 1321 | 1300 | ||
| @@ -1404,6 +1383,7 @@ void Application::init() { · 82 unmodified lines | |||
| 1404 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelColorMode), 0, 2); | 1383 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelColorMode), 0, 2); |
| 1405 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelGetColorMode), 0, 3); | 1384 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelGetColorMode), 0, 3); |
| 1406 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelSelectMode), 0, 4); | 1385 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelSelectMode), 0, 4); |
| 1386 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelNudgeMode), 0, 5); | ||
| 1407 | 1387 | ||
| 1408 | _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg", | 1388 | _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg", |
| 1409 | _glWidget->width(), | 1389 | _glWidget->width(), |
| @@ -1590,11 +1570,6 @@ void Application::update(float deltaTime) { · 180 unmodified lines | |||
| 1590 | hoveredNode->setColor(_hoverVoxelOriginalColor); | 1570 | hoveredNode->setColor(_hoverVoxelOriginalColor); |
| 1591 | _isHoverVoxelSounding = false; | 1571 | _isHoverVoxelSounding = false; |
| 1592 | } | 1572 | } |
| 1593 | // if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode)) { | ||
| 1594 | // nudgeVoxels(); | ||
| 1595 | // _nudgeCount++; | ||
| 1596 | // qDebug("nudgeCount = %d\n", _nudgeCount); | ||
| 1597 | // } | ||
| 1598 | } else { | 1573 | } else { |
| 1599 | // Voxel is not found, clear all | 1574 | // Voxel is not found, clear all |
| 1600 | _isHoverVoxelSounding = false; | 1575 | _isHoverVoxelSounding = false; |
| @@ -1689,6 +1664,8 @@ void Application::update(float deltaTime) { · 88 unmodified lines | |||
| 1689 | // yellow indicates selection | 1664 | // yellow indicates selection |
| 1690 | _mouseVoxel.red = _mouseVoxel.green = 255; | 1665 | _mouseVoxel.red = _mouseVoxel.green = 255; |
| 1691 | _mouseVoxel.blue = 0; | 1666 | _mouseVoxel.blue = 0; |
| 1667 | } else if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) { | ||
| 1668 | _mouseVoxel.red = _mouseVoxel.green = _mouseVoxel.blue = 255; | ||
| 1692 | } else { // _addVoxelMode->isChecked() || _colorVoxelMode->isChecked() | 1669 | } else { // _addVoxelMode->isChecked() || _colorVoxelMode->isChecked() |
| 1693 | QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>(); | 1670 | QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>(); |
| 1694 | _mouseVoxel.red = paintColor.red(); | 1671 | _mouseVoxel.red = paintColor.red(); |
| @@ -2221,7 +2198,14 @@ void Application::displaySide(Camera& whichCamera) { · 526 unmodified lines | |||
| 2221 | glDisable(GL_LIGHTING); | 2198 | glDisable(GL_LIGHTING); |
| 2222 | glPushMatrix(); | 2199 | glPushMatrix(); |
| 2223 | glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE); | 2200 | glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE); |
| 2224 | renderMouseVoxelGrid(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); | 2201 | if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) { |
| 2202 | VoxelNode* selectedNode = _voxels.getVoxelAt(_nudgeVoxel.x, _nudgeVoxel.y, _nudgeVoxel.z, _nudgeVoxel.s); | ||
| 2203 | if (selectedNode) { | ||
| 2204 | renderNudgeGrid(_nudgeVoxel.x, _nudgeVoxel.y, _nudgeVoxel.z, _nudgeVoxel.s); | ||
| 2205 | } | ||
| 2206 | } else { | ||
| 2207 | renderMouseVoxelGrid(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); | ||
| 2208 | } | ||
| 2225 | if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode)) { | 2209 | if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode)) { |
| 2226 | // use a contrasting color so that we can see what we're doing | 2210 | // use a contrasting color so that we can see what we're doing |
| 2227 | glColor3ub(_mouseVoxel.red + 128, _mouseVoxel.green + 128, _mouseVoxel.blue + 128); | 2211 | glColor3ub(_mouseVoxel.red + 128, _mouseVoxel.green + 128, _mouseVoxel.blue + 128); |