History

added basic particle server renamed voxel packet names to fit standard

ZappoMan committed 12 years ago

Commit 821b4901 parent aec0e9f2 files · +9 −9Browse files

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

Unified · Split

interface/src/Application.cpp+6−6
@@ -1478,7 +1478,7 @@ void Application::removeVoxel(glm::vec3 position, · 1477 unmodified lines
1478 voxel.y = position.y / TREE_SCALE;1478 voxel.y = position.y / TREE_SCALE;
1479 voxel.z = position.z / TREE_SCALE;1479 voxel.z = position.z / TREE_SCALE;
1480 voxel.s = scale / TREE_SCALE;1480 voxel.s = scale / TREE_SCALE;
1481 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, voxel);1481 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_VOXEL_ERASE, voxel);
1482 1482
1483 // delete it locally to see the effect immediately (and in case no voxel server is present)1483 // delete it locally to see the effect immediately (and in case no voxel server is present)
1484 _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);1484 _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);
@@ -1498,7 +1498,7 @@ void Application::makeVoxel(glm::vec3 position, · 13 unmodified lines
1498 voxel.red = red;1498 voxel.red = red;
1499 voxel.green = green;1499 voxel.green = green;
1500 voxel.blue = blue;1500 voxel.blue = blue;
1501 PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL;1501 PACKET_TYPE message = isDestructive ? PACKET_TYPE_VOXEL_SET_DESTRUCTIVE : PACKET_TYPE_VOXEL_SET;
1502 _voxelEditSender.sendVoxelEditMessage(message, voxel);1502 _voxelEditSender.sendVoxelEditMessage(message, voxel);
1503 1503
1504 // create the voxel locally so it appears immediately1504 // create the voxel locally so it appears immediately
@@ -1580,7 +1580,7 @@ bool Application::sendVoxelsOperation(OctreeElement* element, void* extraData) { · 75 unmodified lines
1580 codeColorBuffer[bytesInCode + RED_INDEX] = voxel->getColor()[RED_INDEX];1580 codeColorBuffer[bytesInCode + RED_INDEX] = voxel->getColor()[RED_INDEX];
1581 codeColorBuffer[bytesInCode + GREEN_INDEX] = voxel->getColor()[GREEN_INDEX];1581 codeColorBuffer[bytesInCode + GREEN_INDEX] = voxel->getColor()[GREEN_INDEX];
1582 codeColorBuffer[bytesInCode + BLUE_INDEX] = voxel->getColor()[BLUE_INDEX];1582 codeColorBuffer[bytesInCode + BLUE_INDEX] = voxel->getColor()[BLUE_INDEX];
1583 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE, 1583 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_VOXEL_SET_DESTRUCTIVE,
1584 codeColorBuffer, codeAndColorLength);1584 codeColorBuffer, codeAndColorLength);
1585 1585
1586 delete[] codeColorBuffer;1586 delete[] codeColorBuffer;
@@ -3977,7 +3977,7 @@ bool Application::maybeEditVoxelUnderCursor() { · 2390 unmodified lines
3977void Application::deleteVoxelUnderCursor() {3977void Application::deleteVoxelUnderCursor() {
3978 if (_mouseVoxel.s != 0) {3978 if (_mouseVoxel.s != 0) {
3979 // sending delete to the server is sufficient, server will send new version so we see updates soon enough3979 // sending delete to the server is sufficient, server will send new version so we see updates soon enough
3980 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, _mouseVoxel);3980 _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_VOXEL_ERASE, _mouseVoxel);
3981 3981
3982 // delete it locally to see the effect immediately (and in case no voxel server is present)3982 // delete it locally to see the effect immediately (and in case no voxel server is present)
3983 _voxels.deleteVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);3983 _voxels.deleteVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
@@ -4235,8 +4235,8 @@ void* Application::networkReceive(void* args) { · 251 unmodified lines
4235 app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived);4235 app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived);
4236 break;4236 break;
4237 case PACKET_TYPE_VOXEL_DATA:4237 case PACKET_TYPE_VOXEL_DATA:
4238 case PACKET_TYPE_ERASE_VOXEL:4238 case PACKET_TYPE_VOXEL_ERASE:
4239 case PACKET_TYPE_VOXEL_STATS:4239 case PACKET_TYPE_OCTREE_STATS:
4240 case PACKET_TYPE_ENVIRONMENT_DATA: {4240 case PACKET_TYPE_ENVIRONMENT_DATA: {
4241 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), 4241 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4242 "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");4242 "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