History

make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes

ZappoMan committed 13 years ago

Commit 60dedee1 parent 7d2c69f7 files · +120 −16Browse files

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

Unified · Split

interface/src/Application.cpp+11−9
@@ -3826,15 +3826,16 @@ void Application::nodeKilled(Node* node) { · 3825 unmodified lines
38263826 uint16_t nodeID = node->getNodeID();
38273827 // see if this is the first we've heard of this node...
38283828 if (_voxelServerJurisdictions.find(nodeID) != _voxelServerJurisdictions.end()) {
3829− VoxelPositionSize jurisditionDetails;
3830− jurisditionDetails = _voxelServerJurisdictions[nodeID];
3829+ unsigned char* rootCode = _voxelServerJurisdictions[nodeID].getRootOctalCode();
3830+ VoxelPositionSize rootDetails;
3831+ voxelDetailsForCode(rootCode, rootDetails);
38313832
38323833 printf("voxel server going away...... v[%f, %f, %f, %f]\n",
3833− jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s);
3834+ rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
38343835
38353836 // Add the jurisditionDetails object to the list of "fade outs"
38363837 VoxelFade fade(VoxelFade::FADE_OUT, NODE_KILLED_RED, NODE_KILLED_GREEN, NODE_KILLED_BLUE);
3837− fade.voxelDetails = jurisditionDetails;
3838+ fade.voxelDetails = rootDetails;
38383839 const float slightly_smaller = 0.99;
38393840 fade.voxelDetails.s = fade.voxelDetails.s * slightly_smaller;
38403841 _voxelFades.push_back(fade);
@@ -3855,23 +3856,24 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng · 14 unmodified lines
38553856 if (voxelServer) {
38563857 uint16_t nodeID = voxelServer->getNodeID();
38573858
3858− VoxelPositionSize jurisditionDetails;
3859− voxelDetailsForCode(_voxelSceneStats.getJurisdictionRoot(), jurisditionDetails);
3859+ VoxelPositionSize rootDetails;
3860+ voxelDetailsForCode(_voxelSceneStats.getJurisdictionRoot(), rootDetails);
38603861
38613862 // see if this is the first we've heard of this node...
38623863 if (_voxelServerJurisdictions.find(nodeID) == _voxelServerJurisdictions.end()) {
38633864 printf("stats from new voxel server... v[%f, %f, %f, %f]\n",
3864− jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s);
3865+ rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
38653866
38663867 // Add the jurisditionDetails object to the list of "fade outs"
38673868 VoxelFade fade(VoxelFade::FADE_OUT, NODE_ADDED_RED, NODE_ADDED_GREEN, NODE_ADDED_BLUE);
3868− fade.voxelDetails = jurisditionDetails;
3869+ fade.voxelDetails = rootDetails;
38693870 const float slightly_smaller = 0.99;
38703871 fade.voxelDetails.s = fade.voxelDetails.s * slightly_smaller;
38713872 _voxelFades.push_back(fade);
38723873 }
38733874 // store jurisdiction details for later use
3874− _voxelServerJurisdictions[nodeID] = jurisditionDetails;
3875+ _voxelServerJurisdictions[nodeID] = JurisdictionMap(_voxelSceneStats.getJurisdictionRoot(),
3876+ _voxelSceneStats.getJurisdictionEndNodes());
38753877 }
38763878 return statsMessageLength;
38773879 }

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