History

removed app from SendVoxelsOperationArgs since its available as singleton

ZappoMan committed 13 years ago

Commit 8e07bd41 parent 8b867df1 file · +2 −4Browse files

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

Unified · Split

interface/src/Application.cpp+2−4
@@ -1553,7 +1553,6 @@ void Application::chooseVoxelPaintColor() { · 1552 unmodified lines
1553const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;1553const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;
1554struct SendVoxelsOperationArgs {1554struct SendVoxelsOperationArgs {
1555 unsigned char* newBaseOctCode;1555 unsigned char* newBaseOctCode;
1556 Application* app;
1557};1556};
1558 1557
1559bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {1558bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {
@@ -1585,7 +1584,8 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 25 unmodified lines
1585 codeColorBuffer[bytesInCode + GREEN_INDEX] = node->getColor()[GREEN_INDEX];1584 codeColorBuffer[bytesInCode + GREEN_INDEX] = node->getColor()[GREEN_INDEX];
1586 codeColorBuffer[bytesInCode + BLUE_INDEX ] = node->getColor()[BLUE_INDEX ];1585 codeColorBuffer[bytesInCode + BLUE_INDEX ] = node->getColor()[BLUE_INDEX ];
1587 1586
1588 args->app->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE, codeColorBuffer, codeAndColorLength);1587 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE,
1588 codeColorBuffer, codeAndColorLength);
1589 1589
1590 delete[] codeColorBuffer;1590 delete[] codeColorBuffer;
1591 }1591 }
@@ -1769,7 +1769,6 @@ void Application::importVoxels() { · 177 unmodified lines
1769 // the server as an set voxel message, this will also rebase the voxels to the new location1769 // the server as an set voxel message, this will also rebase the voxels to the new location
1770 unsigned char* calculatedOctCode = NULL;1770 unsigned char* calculatedOctCode = NULL;
1771 SendVoxelsOperationArgs args;1771 SendVoxelsOperationArgs args;
1772 args.app = this;
1773 1772
1774 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the1773 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the
1775 // voxel size/position details.1774 // voxel size/position details.
@@ -1818,7 +1817,6 @@ void Application::pasteVoxels() { · 42 unmodified lines
1818 // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to 1817 // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to
1819 // the server as an set voxel message, this will also rebase the voxels to the new location1818 // the server as an set voxel message, this will also rebase the voxels to the new location
1820 SendVoxelsOperationArgs args;1819 SendVoxelsOperationArgs args;
1821 args.app = this;
1822 1820
1823 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the1821 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the
1824 // voxel size/position details. If we don't have an actual selectedNode then use the mouseVoxel to create a 1822 // voxel size/position details. If we don't have an actual selectedNode then use the mouseVoxel to create a

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