History

resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit d2f7dd22 parents 71aca69 5d5101462 files · +1764 −1285Browse files

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

Unified · Split

interface/src/Application.cpp+6−6
@@ -1482,7 +1482,7 @@ void Application::removeVoxel(glm::vec3 position, · 1481 unmodified lines
1482 voxel.y = position.y / TREE_SCALE;1482 voxel.y = position.y / TREE_SCALE;
1483 voxel.z = position.z / TREE_SCALE;1483 voxel.z = position.z / TREE_SCALE;
1484 voxel.s = scale / TREE_SCALE;1484 voxel.s = scale / TREE_SCALE;
1485 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, voxel);1485 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_VOXEL_ERASE, voxel);
1486 1486
1487 // delete it locally to see the effect immediately (and in case no voxel server is present)1487 // delete it locally to see the effect immediately (and in case no voxel server is present)
1488 _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);1488 _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);
@@ -1502,7 +1502,7 @@ void Application::makeVoxel(glm::vec3 position, · 13 unmodified lines
1502 voxel.red = red;1502 voxel.red = red;
1503 voxel.green = green;1503 voxel.green = green;
1504 voxel.blue = blue;1504 voxel.blue = blue;
1505 PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL;1505 PACKET_TYPE message = isDestructive ? PACKET_TYPE_VOXEL_SET_DESTRUCTIVE : PACKET_TYPE_VOXEL_SET;
1506 _voxelEditSender.sendVoxelEditMessage(message, voxel);1506 _voxelEditSender.sendVoxelEditMessage(message, voxel);
1507 1507
1508 // create the voxel locally so it appears immediately1508 // create the voxel locally so it appears immediately
@@ -1584,7 +1584,7 @@ bool Application::sendVoxelsOperation(OctreeElement* element, void* extraData) { · 75 unmodified lines
1584 codeColorBuffer[bytesInCode + RED_INDEX] = voxel->getColor()[RED_INDEX];1584 codeColorBuffer[bytesInCode + RED_INDEX] = voxel->getColor()[RED_INDEX];
1585 codeColorBuffer[bytesInCode + GREEN_INDEX] = voxel->getColor()[GREEN_INDEX];1585 codeColorBuffer[bytesInCode + GREEN_INDEX] = voxel->getColor()[GREEN_INDEX];
1586 codeColorBuffer[bytesInCode + BLUE_INDEX] = voxel->getColor()[BLUE_INDEX];1586 codeColorBuffer[bytesInCode + BLUE_INDEX] = voxel->getColor()[BLUE_INDEX];
1587 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE, 1587 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_VOXEL_SET_DESTRUCTIVE,
1588 codeColorBuffer, codeAndColorLength);1588 codeColorBuffer, codeAndColorLength);
1589 1589
1590 delete[] codeColorBuffer;1590 delete[] codeColorBuffer;
@@ -3980,7 +3980,7 @@ bool Application::maybeEditVoxelUnderCursor() { · 2389 unmodified lines
3980void Application::deleteVoxelUnderCursor() {3980void Application::deleteVoxelUnderCursor() {
3981 if (_mouseVoxel.s != 0) {3981 if (_mouseVoxel.s != 0) {
3982 // sending delete to the server is sufficient, server will send new version so we see updates soon enough3982 // sending delete to the server is sufficient, server will send new version so we see updates soon enough
3983 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, _mouseVoxel);3983 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_VOXEL_ERASE, _mouseVoxel);
3984 3984
3985 // delete it locally to see the effect immediately (and in case no voxel server is present)3985 // delete it locally to see the effect immediately (and in case no voxel server is present)
3986 _voxels.deleteVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);3986 _voxels.deleteVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
@@ -4242,8 +4242,8 @@ void* Application::networkReceive(void* args) { · 255 unmodified lines
4242 app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived);4242 app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived);
4243 break;4243 break;
4244 case PACKET_TYPE_VOXEL_DATA:4244 case PACKET_TYPE_VOXEL_DATA:
4245 case PACKET_TYPE_ERASE_VOXEL:4245 case PACKET_TYPE_VOXEL_ERASE:
4246 case PACKET_TYPE_VOXEL_STATS:4246 case PACKET_TYPE_OCTREE_STATS:
4247 case PACKET_TYPE_ENVIRONMENT_DATA: {4247 case PACKET_TYPE_ENVIRONMENT_DATA: {
4248 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), 4248 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4249 "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");4249 "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");

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