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
15531553 const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;
15541554 struct SendVoxelsOperationArgs {
15551555 unsigned char* newBaseOctCode;
1556− Application* app;
15571556 };
15581557
15591558 bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {
@@ -1585,7 +1584,8 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 25 unmodified lines
15851584 codeColorBuffer[bytesInCode + GREEN_INDEX] = node->getColor()[GREEN_INDEX];
15861585 codeColorBuffer[bytesInCode + BLUE_INDEX ] = node->getColor()[BLUE_INDEX ];
15871586
1588− args->app->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE, codeColorBuffer, codeAndColorLength);
1587+ getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE,
1588+ codeColorBuffer, codeAndColorLength);
15891589
15901590 delete[] codeColorBuffer;
15911591 }
@@ -1769,7 +1769,6 @@ void Application::importVoxels() { · 177 unmodified lines
17691769 // the server as an set voxel message, this will also rebase the voxels to the new location
17701770 unsigned char* calculatedOctCode = NULL;
17711771 SendVoxelsOperationArgs args;
1772− args.app = this;
17731772
17741773 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the
17751774 // voxel size/position details.
@@ -1818,7 +1817,6 @@ void Application::pasteVoxels() { · 42 unmodified lines
18181817 // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to
18191818 // the server as an set voxel message, this will also rebase the voxels to the new location
18201819 SendVoxelsOperationArgs args;
1821− args.app = this;
18221820
18231821 // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the
18241822 // 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