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
14821482 voxel.y = position.y / TREE_SCALE;
14831483 voxel.z = position.z / TREE_SCALE;
14841484 voxel.s = scale / TREE_SCALE;
1485− _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, voxel);
1485+ _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_VOXEL_ERASE, voxel);
14861486
14871487 // delete it locally to see the effect immediately (and in case no voxel server is present)
14881488 _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);
@@ -1502,7 +1502,7 @@ void Application::makeVoxel(glm::vec3 position, · 13 unmodified lines
15021502 voxel.red = red;
15031503 voxel.green = green;
15041504 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;
15061506 _voxelEditSender.sendVoxelEditMessage(message, voxel);
15071507
15081508 // create the voxel locally so it appears immediately
@@ -1584,7 +1584,7 @@ bool Application::sendVoxelsOperation(OctreeElement* element, void* extraData) { · 75 unmodified lines
15841584 codeColorBuffer[bytesInCode + RED_INDEX] = voxel->getColor()[RED_INDEX];
15851585 codeColorBuffer[bytesInCode + GREEN_INDEX] = voxel->getColor()[GREEN_INDEX];
15861586 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,
15881588 codeColorBuffer, codeAndColorLength);
15891589
15901590 delete[] codeColorBuffer;
@@ -3980,7 +3980,7 @@ bool Application::maybeEditVoxelUnderCursor() { · 2389 unmodified lines
39803980 void Application::deleteVoxelUnderCursor() {
39813981 if (_mouseVoxel.s != 0) {
39823982 // 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);
39843984
39853985 // delete it locally to see the effect immediately (and in case no voxel server is present)
39863986 _voxels.deleteVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
@@ -4242,8 +4242,8 @@ void* Application::networkReceive(void* args) { · 255 unmodified lines
42424242 app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived);
42434243 break;
42444244 case PACKET_TYPE_VOXEL_DATA:
4245− case PACKET_TYPE_ERASE_VOXEL:
4246− case PACKET_TYPE_VOXEL_STATS:
4245+ case PACKET_TYPE_VOXEL_ERASE:
4246+ case PACKET_TYPE_OCTREE_STATS:
42474247 case PACKET_TYPE_ENVIRONMENT_DATA: {
42484248 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
42494249 "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