History

Add VoxelNudgeMode and preliminary UI grid for nudging.

LionTurtle committed 13 years ago

Commit 868ef8b1 parent 647bd5b8 files · +94 −83Browse files

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

Unified · Split

interface/src/Application.cpp+34−50
@@ -130,8 +130,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 129 unmodified lines
130130 _bytesPerSecond(0),
131131 _bytesCount(0),
132132 _swatch(NULL),
133− _pasteMode(false),
134− _nudgeCount(0)
133+ _pasteMode(false)
135134 {
136135 _applicationStartupTime = startup_time;
137136 _window->setWindowTitle("Interface");
@@ -689,6 +688,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 551 unmodified lines
689688 case Qt::Key_O:
690689 Menu::getInstance()->triggerOption(MenuOption::VoxelSelectMode);
691690 break;
691+ case Qt::Key_N:
692+ Menu::getInstance()->triggerOption(MenuOption::VoxelNudgeMode);
693+ break;
692694 case Qt::Key_Slash:
693695 Menu::getInstance()->triggerOption(MenuOption::Stats);
694696 break;
@@ -830,6 +832,9 @@ void Application::mousePressEvent(QMouseEvent* event) { · 135 unmodified lines
830832 }
831833
832834 if (MAKE_SOUND_ON_VOXEL_CLICK && _isHoverVoxel && !_isHoverVoxelSounding) {
835+ if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) {
836+ _nudgeVoxel = _hoverVoxel;
837+ }
833838 _hoverVoxelOriginalColor[0] = _hoverVoxel.red;
834839 _hoverVoxelOriginalColor[1] = _hoverVoxel.green;
835840 _hoverVoxelOriginalColor[2] = _hoverVoxel.blue;
@@ -1274,48 +1279,22 @@ void Application::pasteVoxels() { · 438 unmodified lines
12741279 }
12751280
12761281 void Application::nudgeVoxels() {
1277− VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
1278−
1279− if (selectedNode) {
1280− qDebug("UnNudged xyz: %f, %f, %f\n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z);
1281− // // clear the clipboard first...
1282− // _clipboard.killLocalVoxels();
1283−
1284− // nudge the node
1285− glm::vec3 nudgeVec(0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s);
1286− // glm::vec3 nudgeVec(_mouseVoxel.s, _mouseVoxel.s, _mouseVoxel.s);
1287− // _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, _mouseVoxel);
1288− _voxels.getVoxelTree()->nudgeSubTree(selectedNode, nudgeVec, _voxelEditSender);
1289−
1290− // if (!selectedNode) {
1291− // qDebug("new node is null\n");
1292− // } else {
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");
1282+ if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) {
1283+ VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
1284+
1285+ if (selectedNode) {
1286+ // glPushMatrix();
1287+ // glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE);
1288+ // renderNudgeGrid(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
1289+ // glPopMatrix();
1290+ qDebug("UnNudged xyz: %f, %f, %f\n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z);
1291+
1292+ // nudge the node
1293+ // glm::vec3 nudgeVec(_mouseVoxel.s, _mouseVoxel.s, _mouseVoxel.s);
1294+ // glm::vec3 nudgeVec(0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s, 0.5 * _mouseVoxel.s);
1295+ glm::vec3 nudgeVec(0.25 * _mouseVoxel.s, 0.25 * _mouseVoxel.s, 0.25 * _mouseVoxel.s);
1296+ _voxels.getVoxelTree()->nudgeSubTree(selectedNode, nudgeVec, _voxelEditSender);
1297+ }
13191298 }
13201299 }
13211300
@@ -1404,6 +1383,7 @@ void Application::init() { · 82 unmodified lines
14041383 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelColorMode), 0, 2);
14051384 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelGetColorMode), 0, 3);
14061385 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelSelectMode), 0, 4);
1386+ _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelNudgeMode), 0, 5);
14071387
14081388 _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg",
14091389 _glWidget->width(),
@@ -1590,11 +1570,6 @@ void Application::update(float deltaTime) { · 180 unmodified lines
15901570 hoveredNode->setColor(_hoverVoxelOriginalColor);
15911571 _isHoverVoxelSounding = false;
15921572 }
1593− // if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode)) {
1594− // nudgeVoxels();
1595− // _nudgeCount++;
1596− // qDebug("nudgeCount = %d\n", _nudgeCount);
1597− // }
15981573 } else {
15991574 // Voxel is not found, clear all
16001575 _isHoverVoxelSounding = false;
@@ -1689,6 +1664,8 @@ void Application::update(float deltaTime) { · 88 unmodified lines
16891664 // yellow indicates selection
16901665 _mouseVoxel.red = _mouseVoxel.green = 255;
16911666 _mouseVoxel.blue = 0;
1667+ } else if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelNudgeMode)) {
1668+ _mouseVoxel.red = _mouseVoxel.green = _mouseVoxel.blue = 255;
16921669 } else { // _addVoxelMode->isChecked() || _colorVoxelMode->isChecked()
16931670 QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>();
16941671 _mouseVoxel.red = paintColor.red();
@@ -2221,7 +2198,14 @@ void Application::displaySide(Camera& whichCamera) { · 526 unmodified lines
22212198 glDisable(GL_LIGHTING);
22222199 glPushMatrix();
22232200 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+ }
22252209 if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode)) {
22262210 // use a contrasting color so that we can see what we're doing
22272211 glColor3ub(_mouseVoxel.red + 128, _mouseVoxel.green + 128, _mouseVoxel.blue + 128);

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